Fix 435.gromacs miscompile: call rewrite_close_phi_out_of_ssa from rewrite_cross_bb_p...

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9aa322c7695588336ae477d013f97c18e4f59782..e313596af8ceb6d047a5a39b321231dce8ae59a4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index c2be7c736d787bc2bb8622073eff9f088d31d4a7..ee63b7c979dbcc9c0366978057f05ea0cd27e19b 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,10 @@
+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.

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 318401e2d9beefe50a46c9bd8edbc7bbb8f85fe7..8857946d1ebac685d2309d8336117ab638b733e6 100644 (file)
--- 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 17ee09a5952388d66d1e841f229ca2ba1e2d6194..55c4314bc0b8bc3cb3d63fca0c4e23879fc6c04a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gcc/testsuite/gcc.dg/graphite/id-22.c b/gcc/testsuite/gcc.dg/graphite/id-22.c
new file mode 100644 (file)
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;
+}