OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use gori dependencies to optimize. 

The routine fold_using_range::relation_fold_and_or needs to veriyf that both
operands of 2 stmts are the same, and uses GORIs dependency cache for this.
This cache cannot be counted on to reflect the current contents of a
stmt, expecially in the presence of an IL changing pass.  Instead, look at the
statement operands.

	PR tree-optimization/106114
	gcc/
	* gimple-range-fold.cc (fold_using_range::relation_fold_and_or): Check
	statement operands instead of GORI cache.
	gcc/testsuite/
	* gcc.dg/pr106114.c: New.
This commit is contained in:
Andrew MacLeod 2022-06-29 13:34:05 -04:00
parent e484755aec
commit 918ccccbb0
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gcc/gimple-range-fold.cc
View File

@ -1397,14 +1397,25 @@ fold_using_range::relation_fold_and_or (irange& lhs_range, gimple *s,
// Ideally we search dependencies for common names, and see what pops out.
// until then, simply try to resolve direct dependencies.
// Both names will need to have 2 direct dependencies.
tree ssa1_dep2 = src.gori ()->depend2 (ssa1);
tree ssa2_dep2 = src.gori ()->depend2 (ssa2);
if (!ssa1_dep2 || !ssa2_dep2)
gimple *ssa1_stmt = SSA_NAME_DEF_STMT (ssa1);
gimple *ssa2_stmt = SSA_NAME_DEF_STMT (ssa2);
range_op_handler handler1 (SSA_NAME_DEF_STMT (ssa1));
range_op_handler handler2 (SSA_NAME_DEF_STMT (ssa2));
// If either handler is not present, no relation can be found.
if (!handler1 || !handler2)
return;
// Both stmts will need to have 2 ssa names in the stmt.
tree ssa1_dep1 = gimple_range_ssa_p (gimple_range_operand1 (ssa1_stmt));
tree ssa1_dep2 = gimple_range_ssa_p (gimple_range_operand2 (ssa1_stmt));
tree ssa2_dep1 = gimple_range_ssa_p (gimple_range_operand1 (ssa2_stmt));
tree ssa2_dep2 = gimple_range_ssa_p (gimple_range_operand2 (ssa2_stmt));
if (!ssa1_dep1 || !ssa1_dep2 || !ssa2_dep1 || !ssa2_dep2)
return;
tree ssa1_dep1 = src.gori ()->depend1 (ssa1);
tree ssa2_dep1 = src.gori ()->depend1 (ssa2);
// Make sure they are the same dependencies, and detect the order of the
// relationship.
bool reverse_op2 = true;
@ -1413,13 +1424,6 @@ fold_using_range::relation_fold_and_or (irange& lhs_range, gimple *s,
else if (ssa1_dep1 != ssa2_dep2 || ssa1_dep2 != ssa2_dep1)
return;
range_op_handler handler1 (SSA_NAME_DEF_STMT (ssa1));
range_op_handler handler2 (SSA_NAME_DEF_STMT (ssa2));
// If either handler is not present, no relation is found.
if (!handler1 || !handler2)
return;
int_range<2> bool_one (boolean_true_node, boolean_true_node);
relation_kind relation1 = handler1.op1_op2_relation (bool_one);

14
gcc/testsuite/gcc.dg/pr106114.c Normal file
View File

@ -0,0 +1,14 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fdump-tree-dom2" } */
int printf(const char *, ...);
char a = 139, b;
int main() {
char c = 173;
b = a;
while (c <= a || a < -117)
c = printf("0\n");
return 0;
}
/* { dg-final { scan-tree-dump-times "if" 2 "dom2" } } */