From 6cdb0ee3658b05acfd6e3ffa51047dc4558b14cb Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Sat, 28 Mar 2009 10:11:14 +0000 Subject: [PATCH] re PR tree-optimization/38513 (Only postreload will remove a no-op store) 2009-03-28 Richard Guenther PR tree-optimization/38513 * tree-ssa-pre.c (eliminate): Remove redundant stores. * tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle EXC_PTR_EXPR and FILTER_EXPR. (get_ref_from_reference_ops): Likewise. * gcc.dg/tree-ssa/ssa-fre-21.c: New testcase. * gcc.dg/tree-ssa/ssa-dse-11.c: Adjust. * gcc.dg/vect/vect-reduc-dot-u8a.c: Likewise. * gcc.dg/vect/vect-reduc-dot-u8b.c: Likewise. * gcc.dg/vect/slp-widen-mult-u8.c: Likewise. * gcc.dg/vect/vect-multitypes-16.c: Likewise. * gcc.dg/vect/vect-35.c: Likewise. * gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c: Likewise. * gcc.dg/vect/vect-multitypes-17.c: Likewise. * gcc.dg/vect/slp-widen-mult-s16.c: Likewise. From-SVN: r145172 --- gcc/ChangeLog | 8 +++ gcc/testsuite/ChangeLog | 14 +++++ gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c | 4 +- gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c | 26 +++++++++ .../gcc.dg/vect/slp-widen-mult-s16.c | 10 +--- gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c | 12 +--- gcc/testsuite/gcc.dg/vect/vect-35.c | 8 +-- .../gcc.dg/vect/vect-multitypes-16.c | 8 +-- .../gcc.dg/vect/vect-multitypes-17.c | 11 +--- .../gcc.dg/vect/vect-reduc-dot-u8a.c | 11 +--- .../gcc.dg/vect/vect-reduc-dot-u8b.c | 12 +--- .../gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c | 11 +--- gcc/tree-ssa-pre.c | 57 ++++++++++++++++++- gcc/tree-ssa-sccvn.c | 4 ++ 14 files changed, 128 insertions(+), 68 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 48715d3178d9..d9c59b8b33d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2009-03-28 Richard Guenther + + PR tree-optimization/38513 + * tree-ssa-pre.c (eliminate): Remove redundant stores. + * tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle + EXC_PTR_EXPR and FILTER_EXPR. + (get_ref_from_reference_ops): Likewise. + 2009-03-28 Richard Guenther PR tree-optimization/38968 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0f7df77cf46..1cc8e4f43d2b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2009-03-28 Richard Guenther + + PR tree-optimization/38513 + * gcc.dg/tree-ssa/ssa-fre-21.c: New testcase. + * gcc.dg/tree-ssa/ssa-dse-11.c: Adjust. + * gcc.dg/vect/vect-reduc-dot-u8a.c: Likewise. + * gcc.dg/vect/vect-reduc-dot-u8b.c: Likewise. + * gcc.dg/vect/slp-widen-mult-u8.c: Likewise. + * gcc.dg/vect/vect-multitypes-16.c: Likewise. + * gcc.dg/vect/vect-35.c: Likewise. + * gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c: Likewise. + * gcc.dg/vect/vect-multitypes-17.c: Likewise. + * gcc.dg/vect/slp-widen-mult-s16.c: Likewise. + 2009-03-28 Richard Guenther PR tree-optimization/38968 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c index bd66bc2a78e6..6e13e1875015 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c @@ -6,13 +6,13 @@ void foo(int *p) { while (1) { - *p = 0; + *p = 1; *p = 0; } } void bar(int *p) { - *p = 0; + *p = 1; *p = 0; abort (); } diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c new file mode 100644 index 000000000000..aadf32e21bd6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fdump-tree-fre" } */ + +struct f { + float a; + float b; + float c; + float d; +}; + +struct f a; + +void h(float, float, float, float); + +void g(void) +{ + float a1 = a.a, b = a.b, c = a.c, d = a.d; + a.a = a1; + a.b = b; + a.c = c; + a.d = d; + h(a1, b, c, d); +} + +/* { dg-final { scan-tree-dump-not "a\\\.? = " "fre" } } */ +/* { dg-final { cleanup-tree-dump "fre" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c index b4ed282d0aad..32853d73a15e 100644 --- a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c +++ b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c @@ -5,8 +5,9 @@ #define N 64 -short X[N] __attribute__ ((__aligned__(16))); -short Y[N] __attribute__ ((__aligned__(16))); +short X[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}; +short Y[N] __attribute__ ((__aligned__(16))) = {64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1}; + int result[N]; /* short->int widening-mult */ @@ -26,11 +27,6 @@ int main (void) check_vect (); - for (i=0; ishort widening-mult */ @@ -26,13 +27,6 @@ int main (void) check_vect (); - for (i=0; iqi) */ @@ -28,13 +28,6 @@ int main (void) check_vect (); - for (i=0; ishort->int dot product. Detected as a dot-product pattern. @@ -41,13 +41,6 @@ int main (void) check_vect (); - for (i=0; ishort->short dot product. Detected as a dot-product pattern. @@ -36,14 +36,6 @@ int main (void) check_vect (); - for (i=0; ishort->short dot product. The dot-product pattern should be detected. @@ -37,13 +37,6 @@ int main (void) check_vect (); - for (i=0; ivalnum; + if (val + && operand_equal_p (val, rhs, 0)) + { + def_operand_p def; + use_operand_p use; + vuse_vec_p usevec; + ssa_op_iter oi; + imm_use_iterator ui; + gimple use_stmt; + + if (dump_file && (dump_flags & TDF_DETAILS)) + { + fprintf (dump_file, "Deleted dead store "); + print_gimple_stmt (dump_file, stmt, 0, 0); + } + + /* Propagate all may-uses to the uses of their defs. */ + FOR_EACH_SSA_VDEF_OPERAND (def, usevec, stmt, oi) + { + tree vuse = VUSE_ELEMENT_VAR (*usevec, 0); + tree vdef = DEF_FROM_PTR (def); + + /* If the vdef is used in an abnormal PHI node we + have to propagate that flag to the vuse as well. */ + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (vdef)) + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (vuse) = 1; + + FOR_EACH_IMM_USE_STMT (use_stmt, ui, vdef) + FOR_EACH_IMM_USE_ON_STMT (use, ui) + SET_USE (use, vuse); + } + + gsi_remove (&i, true); + release_defs (stmt); + continue; + } + } /* Visit COND_EXPRs and fold the comparison with the available value-numbers. */ else if (gimple_code (stmt) == GIMPLE_COND) @@ -3999,6 +4052,8 @@ eliminate (void) todo = TODO_cleanup_cfg; } } + + gsi_next (&i); } } diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index dc55676c4a3c..fb903921656f 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -658,6 +658,8 @@ copy_reference_ops_from_ref (tree ref, VEC(vn_reference_op_s, heap) **result) case CONST_DECL: case RESULT_DECL: case SSA_NAME: + case EXC_PTR_EXPR: + case FILTER_EXPR: temp.op0 = ref; break; case ADDR_EXPR: @@ -750,6 +752,8 @@ get_ref_from_reference_ops (VEC(vn_reference_op_s, heap) *ops) case CONST_DECL: case RESULT_DECL: case SSA_NAME: + case FILTER_EXPR: + case EXC_PTR_EXPR: *op0_p = op->op0; break; -- 2.47.3