From fef205d534494307974ac09ebf24af877fbb8e28 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 30 Mar 2012 13:41:24 +0000 Subject: [PATCH] re PR other/52754 (indirect indexing broken with -fpredictive-commoning) 2012-03-30 Richard Guenther PR tree-optimization/52754 * tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Only propagate arbitrary addresses into really plain dereferences. * gcc.target/i386/pr52754.c: New testcase. From-SVN: r186012 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.target/i386/pr52754.c | 33 +++++++++++++++++++++++++ gcc/tree-ssa-forwprop.c | 12 ++++----- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr52754.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 151e5a79c33..84538f8ef08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-03-30 Richard Guenther + + PR tree-optimization/52754 + * tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Only + propagate arbitrary addresses into really plain dereferences. + 2012-03-30 Richard Guenther PR middle-end/52772 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fb232b3913a..549789d81c9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-03-30 Richard Guenther + + PR tree-optimization/52754 + * gcc.target/i386/pr52754.c: New testcase. + 2012-03-30 Richard Guenther PR middle-end/52772 diff --git a/gcc/testsuite/gcc.target/i386/pr52754.c b/gcc/testsuite/gcc.target/i386/pr52754.c new file mode 100644 index 00000000000..0f2dbff2dd7 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr52754.c @@ -0,0 +1,33 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fpredictive-commoning -msse2 -std=c99" } */ +/* { dg-require-effective-target sse2 } */ + +#include + +#include "isa-check.h" +#include "sse-os-support.h" + +int main() +{ + const float mem[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; + + unsigned int indexes[8]; + for (unsigned int i = 0; i < 8; ++i) indexes[i] = i; + + check_isa (); + + if (!sse_os_support ()) + exit (0); + + __m128 x = _mm_setr_ps(0, 1, 2, 3); + for (unsigned int i = 0; i + 4 < 6; ++i) { + const unsigned int *ii = &indexes[i]; + const __m128 tmp = _mm_setr_ps(mem[ii[0]], mem[ii[1]], mem[ii[2]], mem[ii[3]]); + if (0xf != _mm_movemask_ps(_mm_cmpeq_ps(tmp, x))) { + __builtin_abort(); + } + x = _mm_add_ps(x, _mm_set1_ps(1)); + } + + return 0; +} diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 919779526d9..2b16222bbd5 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -905,6 +905,7 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, that of the pointed-to type of the address we can put the dereferenced address on the LHS preserving the original alias-type. */ else if (gimple_assign_lhs (use_stmt) == lhs + && integer_zerop (TREE_OPERAND (lhs, 1)) && useless_type_conversion_p (TREE_TYPE (TREE_OPERAND (def_rhs, 0)), TREE_TYPE (gimple_assign_rhs1 (use_stmt)))) @@ -917,9 +918,8 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, if (TREE_CODE (*def_rhs_basep) == MEM_REF) { new_base = TREE_OPERAND (*def_rhs_basep, 0); - new_offset - = int_const_binop (PLUS_EXPR, TREE_OPERAND (lhs, 1), - TREE_OPERAND (*def_rhs_basep, 1)); + new_offset = fold_convert (TREE_TYPE (TREE_OPERAND (lhs, 1)), + TREE_OPERAND (*def_rhs_basep, 1)); } else { @@ -989,6 +989,7 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, that of the pointed-to type of the address we can put the dereferenced address on the RHS preserving the original alias-type. */ else if (gimple_assign_rhs1 (use_stmt) == rhs + && integer_zerop (TREE_OPERAND (rhs, 1)) && useless_type_conversion_p (TREE_TYPE (gimple_assign_lhs (use_stmt)), TREE_TYPE (TREE_OPERAND (def_rhs, 0)))) @@ -1001,9 +1002,8 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, if (TREE_CODE (*def_rhs_basep) == MEM_REF) { new_base = TREE_OPERAND (*def_rhs_basep, 0); - new_offset - = int_const_binop (PLUS_EXPR, TREE_OPERAND (rhs, 1), - TREE_OPERAND (*def_rhs_basep, 1)); + new_offset = fold_convert (TREE_TYPE (TREE_OPERAND (rhs, 1)), + TREE_OPERAND (*def_rhs_basep, 1)); } else {