diff options
author | Sebastian Pop <sebastian.pop@amd.com> | 2010-08-11 20:26:07 +0000 |
---|---|---|
committer | Sebastian Pop <spop@gcc.gnu.org> | 2010-08-11 20:26:07 +0000 |
commit | aedede66305c45b78044fbc1fc190e67a6c0f5b6 (patch) | |
tree | 00319d85ba4ea5c68c438684a826686d8f0d8d52 /gcc | |
parent | f2c51113b78e09421b86d760419348bd714905f0 (diff) | |
download | gcc-aedede66305c45b78044fbc1fc190e67a6c0f5b6.zip gcc-aedede66305c45b78044fbc1fc190e67a6c0f5b6.tar.gz gcc-aedede66305c45b78044fbc1fc190e67a6c0f5b6.tar.bz2 |
Fix 435.gromacs miscompile: call rewrite_close_phi_out_of_ssa from rewrite_cross_bb_phi_deps.
2010-06-24 Sebastian Pop <sebastian.pop@amd.com>
* graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call
rewrite_close_phi_out_of_ssa.
* gcc.dg/graphite/id-22.c: New.
From-SVN: r163130
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/ChangeLog.graphite | 7 | ||||
-rw-r--r-- | gcc/graphite-sese-to-poly.c | 8 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/graphite/id-22.c | 15 |
5 files changed, 37 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9aa322c..e313596 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2010-08-02 Sebastian Pop <sebastian.pop@amd.com> + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call + rewrite_close_phi_out_of_ssa. + +2010-08-02 Sebastian Pop <sebastian.pop@amd.com> + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Remove dead code. 2010-08-02 Sebastian Pop <sebastian.pop@amd.com> diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index c2be7c7..ee63b7c 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,12 @@ 2010-06-24 Sebastian Pop <sebastian.pop@amd.com> + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call + rewrite_close_phi_out_of_ssa. + + * gcc.dg/graphite/id-22.c: New. + +2010-06-24 Sebastian Pop <sebastian.pop@amd.com> + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Remove dead code. 2010-06-24 Sebastian Pop <sebastian.pop@amd.com> diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 318401e..8857946 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2361,8 +2361,12 @@ rewrite_cross_bb_phi_deps (sese region, gimple_stmt_iterator gsi) FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) if (gimple_code (use_stmt) == GIMPLE_PHI) { - gimple_stmt_iterator si = gsi_for_stmt (use_stmt); - rewrite_phi_out_of_ssa (&si); + gimple_stmt_iterator psi = gsi_for_stmt (use_stmt); + + if (scalar_close_phi_node_p (gsi_stmt (psi))) + rewrite_close_phi_out_of_ssa (&psi); + else + rewrite_phi_out_of_ssa (&psi); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 17ee09a..55c4314 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-08-02 Sebastian Pop <sebastian.pop@amd.com> + * gcc.dg/graphite/id-22.c: New. + +2010-08-02 Sebastian Pop <sebastian.pop@amd.com> + * gcc.dg/graphite/run-id-2.c: Call abort. 2010-08-02 Sebastian Pop <sebastian.pop@amd.com> diff --git a/gcc/testsuite/gcc.dg/graphite/id-22.c b/gcc/testsuite/gcc.dg/graphite/id-22.c new file mode 100644 index 0000000..d825542 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/id-22.c @@ -0,0 +1,15 @@ +typedef float rvec[3]; +float calc_similar_ind (int nind, rvec x[]) +{ + int i, j, d; + float m, tm, xd, rd; + for(j=0; j<nind; j++) { + i = x[j][0]; + tm += m; + for(d=0 ; d<3; d++) { + xd = x[i][d] - x[i][d]; + rd += m * xd; + } + } + return rd/tm; +} |