Rename the files and classes to reflect the term infer rather than side-effect.
* Makefile.in (OBJS): Use gimple-range-infer.o.
* gimple-range-cache.cc (ranger_cache::fill_block_cache): Change msg.
(ranger_cache::range_from_dom): Rename var side_effect to infer.
(ranger_cache::apply_inferred_ranges): Rename from apply_side_effects.
* gimple-range-cache.h: Include gimple-range-infer.h.
(class ranger_cache): Adjust prototypes, use infer_range_manager.
* gimple-range-infer.cc: Rename from gimple-range-side-effects.cc.
(gimple_infer_range::*): Rename from stmt_side_effects.
(infer_range_manager::*): Rename from side_effect_manager.
* gimple-range-side-effect.cc: Rename.
* gimple-range-side-effect.h: Rename.
* gimple-range-infer.h: Rename from gimple-range-side-effects.h.
(class gimple_infer_range): Rename from stmt_side_effects.
(class infer_range_manager): Rename from side_effect_manager.
* gimple-range.cc (gimple_ranger::register_inferred_ranges): Rename
from register_side_effects.
* gimple-range.h (register_inferred_ranges): Adjust prototype.
* range-op.h: Adjust comment.
* tree-vrp.cc (rvrp_folder::pre_fold_bb): Use register_inferred_ranges.
(rvrp_folder::post_fold_bb): Use register_inferred_ranges.
gimple-range-edge.o \
gimple-range-fold.o \
gimple-range-gori.o \
- gimple-range-side-effect.o \
+ gimple-range-infer.o \
gimple-range-trace.o \
gimple-ssa-backprop.o \
gimple-ssa-evrp.o \
ranger_cache::edge_range (irange &r, edge e, tree name, enum rfd_mode mode)
{
exit_range (r, name, e->src, mode);
- // If this is not an abnormal edge, check for side effects on exit.
+ // If this is not an abnormal edge, check for inferred ranges on exit.
if ((e->flags & (EDGE_EH | EDGE_ABNORMAL)) == 0)
m_exit.maybe_adjust_range (r, name, e->src);
int_range_max er;
}
// Regardless of whether we have visited pred or not, if the
- // pred has side_effects, revisit this block.
+ // pred has inferred ranges, revisit this block.
// Don't search the DOM tree.
if (m_exit.has_range_p (name, pred))
{
if (DEBUG_RANGE_CACHE)
- fprintf (dump_file, "side effect: update ");
+ fprintf (dump_file, "Inferred range: update ");
m_update->add (node);
}
basic_block bb;
basic_block prev_bb = start_bb;
- // Track any side effects seen
- int_range_max side_effect (TREE_TYPE (name));
+ // Track any inferred ranges seen.
+ int_range_max infer (TREE_TYPE (name));
// Range on entry to the DEF block should not be queried.
gcc_checking_assert (start_bb != def_bb);
bb;
prev_bb = bb, bb = get_immediate_dominator (CDI_DOMINATORS, bb))
{
- // Accumulate any block exit side effects.
- m_exit.maybe_adjust_range (side_effect, name, bb);
+ // Accumulate any block exit inferred ranges.
+ m_exit.maybe_adjust_range (infer, name, bb);
// This block has an outgoing range.
if (m_gori.has_edge_range_p (name, bb))
if (m_gori.outgoing_edge_range_p (er, e, name, *this))
{
r.intersect (er);
- // If this is a normal edge, apply any side effects.
+ // If this is a normal edge, apply any inferred ranges.
if ((e->flags & (EDGE_EH | EDGE_ABNORMAL)) == 0)
m_exit.maybe_adjust_range (r, name, bb);
// Apply non-null if appropriate.
if (!has_abnormal_call_or_eh_pred_edge_p (start_bb))
- r.intersect (side_effect);
+ r.intersect (infer);
if (DEBUG_RANGE_CACHE)
{
// any operands on stmt S to nonnull.
void
-ranger_cache::apply_side_effects (gimple *s)
+ranger_cache::apply_inferred_ranges (gimple *s)
{
int_range_max r;
bool update = true;
basic_block bb = gimple_bb (s);
- stmt_side_effects se(s);
- if (se.num () == 0)
+ gimple_infer_range infer(s);
+ if (infer.num () == 0)
return;
// Do not update the on-netry cache for block ending stmts.
update = false;
}
- for (unsigned x = 0; x < se.num (); x++)
+ for (unsigned x = 0; x < infer.num (); x++)
{
- tree name = se.name (x);
- m_exit.add_range (name, bb, se.range (x));
+ tree name = infer.name (x);
+ m_exit.add_range (name, bb, infer.range (x));
if (update)
{
if (!m_on_entry.get_bb_range (r, name, bb))
exit_range (r, name, bb, RFD_READ_ONLY);
- if (r.intersect (se.range (x)))
+ if (r.intersect (infer.range (x)))
m_on_entry.set_bb_range (name, bb, r);
}
}
#define GCC_SSA_RANGE_CACHE_H
#include "gimple-range-gori.h"
-#include "gimple-range-side-effect.h"
+#include "gimple-range-infer.h"
// This class manages a vector of pointers to ssa_block ranges. It
// provides the basis for the "range on entry" cache for all
void propagate_updated_value (tree name, basic_block bb);
- void apply_side_effects (gimple *s);
+ void apply_inferred_ranges (gimple *s);
gori_compute m_gori;
- side_effect_manager m_exit;
+ infer_range_manager m_exit;
void dump_bb (FILE *f, basic_block bb);
virtual void dump (FILE *f) override;
-/* Gimple range side effect implementation.
+/* Gimple range inference implementation.
Copyright (C) 2022 Free Software Foundation, Inc.
Contributed by Andrew MacLeod <amacleod@redhat.com>.
// Adapted from infer_nonnull_range_by_dereference and check_loadstore
// to process nonnull ssa_name OP in S. DATA contains a pointer to a
-// stmt side effects instance.
+// stmt range inference instance.
static bool
non_null_loadstore (gimple *, tree op, tree, void *data)
if (!targetm.addr_space.zero_address_valid (as))
{
tree ssa = TREE_OPERAND (op, 0);
- ((stmt_side_effects *)data)->add_nonzero (ssa);
+ ((gimple_infer_range *)data)->add_nonzero (ssa);
}
}
return false;
}
-// Add NAME and RANGE to the the side effect summary.
+// Add NAME and RANGE to the the range inference summary.
void
-stmt_side_effects::add_range (tree name, irange &range)
+gimple_infer_range::add_range (tree name, irange &range)
{
m_names[num_args] = name;
m_ranges[num_args] = range;
num_args++;
}
-// Add a nonzero range for NAME to the side effect summary.
+// Add a nonzero range for NAME to the range inference summary.
void
-stmt_side_effects::add_nonzero (tree name)
+gimple_infer_range::add_nonzero (tree name)
{
if (!gimple_range_ssa_p (name))
return;
add_range (name, nz);
}
-// Process S for side effects and fill in the summary list.
-// This is the routine where new side effects should be added.
+// Process S for range inference and fill in the summary list.
+// This is the routine where new inferred ranges should be added.
-stmt_side_effects::stmt_side_effects (gimple *s)
+gimple_infer_range::gimple_infer_range (gimple *s)
{
num_args = 0;
// -------------------------------------------------------------------------
-// This class is an element in list of side effect ranges.
+// This class is an element in list of infered ranges.
class exit_range
{
// Otherwise return NULL.
exit_range *
-side_effect_manager::exit_range_head::find_ptr (tree ssa)
+infer_range_manager::exit_range_head::find_ptr (tree ssa)
{
// Return NULL if SSA is not in this list.
if (!m_names || !bitmap_bit_p (m_names, SSA_NAME_VERSION (ssa)))
return NULL;
}
-// Construct a side effects manager. DO_SEARCH indicates whether an immediate
+// Construct a range infer manager. DO_SEARCH indicates whether an immediate
// use scan should be made the first time a name is processed. This is for
// on-demand clients who may not visit every statement and may miss uses.
-side_effect_manager::side_effect_manager (bool do_search)
+infer_range_manager::infer_range_manager (bool do_search)
{
bitmap_obstack_initialize (&m_bitmaps);
m_on_exit.create (0);
m_nonzero.safe_grow_cleared (num_ssa_names + 1);
}
-// Destruct a side effects manager.
+// Destruct a range infer manager.
-side_effect_manager::~side_effect_manager ()
+infer_range_manager::~infer_range_manager ()
{
m_nonzero.release ();
obstack_free (&m_list_obstack, NULL);
// the cache, creating it if necessary.
const irange&
-side_effect_manager::get_nonzero (tree name)
+infer_range_manager::get_nonzero (tree name)
{
unsigned v = SSA_NAME_VERSION (name);
if (v >= m_nonzero.length ())
return *(m_nonzero[v]);
}
-// Return TRUE if NAME has a side effect range in block BB.
+// Return TRUE if NAME has a range inference in block BB.
bool
-side_effect_manager::has_range_p (tree name, basic_block bb)
+infer_range_manager::has_range_p (tree name, basic_block bb)
{
// Check if this is an immediate use search model.
if (m_seen && !bitmap_bit_p (m_seen, SSA_NAME_VERSION (name)))
return true;
}
-// Return TRUE if NAME has a side effect range in block BB, and adjust range R
+// Return TRUE if NAME has a range inference in block BB, and adjust range R
// to include it.
bool
-side_effect_manager::maybe_adjust_range (irange &r, tree name, basic_block bb)
+infer_range_manager::maybe_adjust_range (irange &r, tree name, basic_block bb)
{
if (!has_range_p (name, bb))
return false;
return r.intersect (*(ptr->range));
}
-// Add range R as a side effect for NAME in block BB.
+// Add range R as an inferred range for NAME in block BB.
void
-side_effect_manager::add_range (tree name, basic_block bb, const irange &r)
+infer_range_manager::add_range (tree name, basic_block bb, const irange &r)
{
if (bb->index >= (int)m_on_exit.length ())
m_on_exit.safe_grow_cleared (last_basic_block_for_fn (cfun) + 1);
m_on_exit[bb->index].head = ptr;
}
-// Add a non-zero side effect for NAME in block BB.
+// Add a non-zero inferred range for NAME in block BB.
void
-side_effect_manager::add_nonzero (tree name, basic_block bb)
+infer_range_manager::add_nonzero (tree name, basic_block bb)
{
add_range (name, bb, get_nonzero (name));
}
-// Follow immediate use chains and find all side effects for NAME.
+// Follow immediate use chains and find all inferred ranges for NAME.
void
-side_effect_manager::register_all_uses (tree name)
+infer_range_manager::register_all_uses (tree name)
{
gcc_checking_assert (m_seen);
use_operand_p use_p;
imm_use_iterator iter;
- // Loop over each immediate use and see if it has a side effect.
+ // Loop over each immediate use and see if it has an inferred range.
FOR_EACH_IMM_USE_FAST (use_p, iter, name)
{
gimple *s = USE_STMT (use_p);
- stmt_side_effects se (s);
- for (unsigned x = 0; x < se.num (); x++)
+ gimple_infer_range infer (s);
+ for (unsigned x = 0; x < infer.num (); x++)
{
- if (name == se.name (x))
- add_range (name, gimple_bb (s), se.range (x));
+ if (name == infer.name (x))
+ add_range (name, gimple_bb (s), infer.range (x));
}
}
}
-/* Header file for gimple range side effects.
+/* Header file for gimple range inference.
Copyright (C) 2022 Free Software Foundation, Inc.
Contributed by Andrew MacLeod <amacleod@redhat.com>.
#ifndef GCC_GIMPLE_RANGE_SIDE_H
#define GCC_GIMPLE_RANGE_SIDE_H
-// This class manages an on-demand summary of side effects for a statement.
-// It can be instantiated as required and provides a list of side effects.
+// Inferred ranges are ranges which are applied to use operands as a by product
+// of executing an operation.
-// New side effects should added in the constructor of this class.
+// This class manages an on-demand summary of inferred ranges for a statement.
+// It can be instantiated as required and provides a list of inferred ranges.
+// New inferred ranges should added in the constructor of this class.
-class stmt_side_effects
+class gimple_infer_range
{
public:
- stmt_side_effects (gimple *s);
+ gimple_infer_range (gimple *s);
inline unsigned num () const { return num_args; }
inline tree name (unsigned index) const
{ gcc_checking_assert (index < num_args); return m_names[index]; }
inline void bump_index () { if (num_args < size_limit - 1) num_args++; }
};
-// This class manages a list of side effect ranges for each basic block.
-// As side effects are seen, they can be registered to a block and later
+// This class manages a list of inferred ranges for each basic block.
+// As inferences are made, they can be registered to a block and later
// queried. WHen constructed with a TRUE flag, immediate uses chains are
// followed the first time a name is referenced and block populated if
-// thre are any side effects.
+// there are any inferred ranges.
-class side_effect_manager
+class infer_range_manager
{
public:
- side_effect_manager (bool do_search);
- ~side_effect_manager ();
+ infer_range_manager (bool do_search);
+ ~infer_range_manager ();
void add_range (tree name, basic_block bb, const irange &r);
void add_nonzero (tree name, basic_block bb);
bool has_range_p (tree name, basic_block bb);
return ret;
}
-// Called during dominator walks to register any side effects that take effect
-// from this point forward. Current release is only for tracking non-null
-// within a block.
+// Called during dominator walks to register any inferred ranges that take
+// effect from this point forward.
void
-gimple_ranger::register_side_effects (gimple *s)
+gimple_ranger::register_inferred_ranges (gimple *s)
{
// First, export the LHS if it is a new global range.
tree lhs = gimple_get_lhs (s);
fputc ('\n', dump_file);
}
}
- m_cache.apply_side_effects (s);
+ m_cache.apply_inferred_ranges (s);
}
// This routine will export whatever global ranges are known to GCC
void dump_bb (FILE *f, basic_block bb);
auto_edge_flag non_executable_edge_flag;
bool fold_stmt (gimple_stmt_iterator *gsi, tree (*) (tree));
- void register_side_effects (gimple *s);
+ void register_inferred_ranges (gimple *s);
protected:
bool fold_range_internal (irange &r, gimple *s, tree name);
void prefill_name (irange &r, tree name);
const wide_int &lh_ub,
const wide_int &rh_lb,
const wide_int &rh_ub) const;
- // Side effect of relation for generic fold_range clients.
+ // Effect of relation for generic fold_range clients.
virtual bool op1_op2_relation_effect (irange &lhs_range, tree type,
const irange &op1_range,
const irange &op2_range,
m_pta->enter (bb);
for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
gsi_next (&gsi))
- m_ranger->register_side_effects (gsi.phi ());
+ m_ranger->register_inferred_ranges (gsi.phi ());
}
void post_fold_bb (basic_block bb) override
bool ret = m_simplifier.simplify (gsi);
if (!ret)
ret = m_ranger->fold_stmt (gsi, follow_single_use_edges);
- m_ranger->register_side_effects (gsi_stmt (*gsi));
+ m_ranger->register_inferred_ranges (gsi_stmt (*gsi));
return ret;
}
projects / people / ms / gcc.git / commitdiff
