Add recursive GORI recompuations with a depth limit.
PR tree-optimization/109154 gcc/ * gimple-range-gori.cc (gori_compute::may_recompute_p): Add depth limit. * gimple-range-gori.h (may_recompute_p): Add depth param. * params.opt (ranger-recompute-depth): New param. gcc/testsuite/ * gcc.dg/Walloca-13.c: Remove bogus warning that is now fixed.
This commit is contained in:
parent
a23b33a1bd
commit
429a7a8843
4 changed files with 30 additions and 11 deletions
|
@ -1308,7 +1308,7 @@ gori_compute::compute_operand1_and_operand2_range (vrange &r,
|
|||
// direct dependent is exported, it may also change the computed value of NAME.
|
||||
|
||||
bool
|
||||
gori_compute::may_recompute_p (tree name, basic_block bb)
|
||||
gori_compute::may_recompute_p (tree name, basic_block bb, int depth)
|
||||
{
|
||||
tree dep1 = depend1 (name);
|
||||
tree dep2 = depend2 (name);
|
||||
|
@ -1322,22 +1322,36 @@ gori_compute::may_recompute_p (tree name, basic_block bb)
|
|||
if (is_a<gphi *> (s) || gimple_has_side_effects (s))
|
||||
return false;
|
||||
|
||||
// If edge is specified, check if NAME can be recalculated on that edge.
|
||||
if (bb)
|
||||
return ((is_export_p (dep1, bb))
|
||||
|| (dep2 && is_export_p (dep2, bb)));
|
||||
if (!dep2)
|
||||
{
|
||||
// -1 indicates a default param, convert it to the real default.
|
||||
if (depth == -1)
|
||||
{
|
||||
depth = (int)param_ranger_recompute_depth;
|
||||
gcc_checking_assert (depth >= 1);
|
||||
}
|
||||
|
||||
return (is_export_p (dep1)) || (dep2 && is_export_p (dep2));
|
||||
bool res = (bb ? is_export_p (dep1, bb) : is_export_p (dep1));
|
||||
if (res || depth <= 1)
|
||||
return res;
|
||||
// Check another level of recomputation.
|
||||
return may_recompute_p (dep1, bb, --depth);
|
||||
}
|
||||
// Two dependencies terminate the depth of the search.
|
||||
if (bb)
|
||||
return is_export_p (dep1, bb) || is_export_p (dep2, bb);
|
||||
else
|
||||
return is_export_p (dep1) || is_export_p (dep2);
|
||||
}
|
||||
|
||||
// Return TRUE if NAME can be recomputed on edge E. If any direct dependent
|
||||
// is exported on edge E, it may change the computed value of NAME.
|
||||
|
||||
bool
|
||||
gori_compute::may_recompute_p (tree name, edge e)
|
||||
gori_compute::may_recompute_p (tree name, edge e, int depth)
|
||||
{
|
||||
gcc_checking_assert (e);
|
||||
return may_recompute_p (name, e->src);
|
||||
return may_recompute_p (name, e->src, depth);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -172,8 +172,8 @@ private:
|
|||
bool refine_using_relation (tree op1, vrange &op1_range,
|
||||
tree op2, vrange &op2_range,
|
||||
fur_source &src, relation_kind k);
|
||||
bool may_recompute_p (tree name, edge e);
|
||||
bool may_recompute_p (tree name, basic_block bb = NULL);
|
||||
bool may_recompute_p (tree name, edge e, int depth = -1);
|
||||
bool may_recompute_p (tree name, basic_block bb = NULL, int depth = -1);
|
||||
bool compute_operand_range_switch (vrange &r, gswitch *s, const vrange &lhs,
|
||||
tree name, fur_source &src);
|
||||
bool compute_operand1_range (vrange &r, gimple_range_op_handler &handler,
|
||||
|
|
|
@ -908,6 +908,11 @@ Common Joined UInteger Var(param_ranger_logical_depth) Init(6) IntegerRange(1, 9
|
|||
Maximum depth of logical expression evaluation ranger will look through when
|
||||
evaluating outgoing edge ranges.
|
||||
|
||||
-param=ranger-recompute-depth=
|
||||
Common Joined UInteger Var(param_ranger_recompute_depth) Init(5) IntegerRange(1, 100) Param Optimization
|
||||
Maximum depth of instruction chains to consider for recomputation in the
|
||||
outgoing range calculator.
|
||||
|
||||
-param=relation-block-limit=
|
||||
Common Joined UInteger Var(param_relation_block_limit) Init(200) IntegerRange(0, 9999) Param Optimization
|
||||
Maximum number of relations the oracle will register in a basic block.
|
||||
|
|
|
@ -8,5 +8,5 @@ void g (int *p, int *q)
|
|||
{
|
||||
__SIZE_TYPE__ n = (__SIZE_TYPE__)(p - q);
|
||||
if (n < 100)
|
||||
f (__builtin_alloca (n)); // { dg-bogus "may be too large" "" { xfail { *-*-* } } }
|
||||
f (__builtin_alloca (n));
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue