5 files changed, 37 insertions, 13 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1cfd599..ace0104 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-02  Richard Guenther  <rguenther@suse.de>
+	Michael Matz  <matz@suse.de>
+	Tobias Grosser <tobias@grosser.es>
+	Sebastian Pop <sebpop@gmail.com>
+
+	* testsuite/libgomp.graphite/force-parallel-4.c: Adjust.
+	* testsuite/libgomp.graphite/force-parallel-5.c: Likewise.
+	* testsuite/libgomp.graphite/force-parallel-7.c: Likewise.
+	* testsuite/libgomp.graphite/force-parallel-8.c: Likewise.
+
 2012-06-28  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* libgomp.texi: Include gpl_v3.texi instead of gpl.texi.
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-4.c b/libgomp/testsuite/libgomp.graphite/force-parallel-4.c
index c0c6b1c..825bda5 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-4.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-4.c
@@ -47,6 +47,7 @@ int main(void)
 }
 
 /* Check that parallel code generation part make the right answer.  */
+/* { dg-final { scan-tree-dump-times "1 loops carried no dependency" 1 "graphite" } } */
 /* { dg-final { scan-tree-dump-times "2 loops carried no dependency" 1 "graphite" } } */
 /* { dg-final { cleanup-tree-dump "graphite" } } */
 /* { dg-final { scan-tree-dump-times "loopfn.0" 5 "optimized" } } */
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-5.c b/libgomp/testsuite/libgomp.graphite/force-parallel-5.c
index b72b021..5c944dc 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-5.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-5.c
@@ -31,7 +31,7 @@ int main(void)
 }
 
 /* Check that parallel code generation part make the right answer.  */
-/* { dg-final { scan-tree-dump-times "2 loops carried no dependency" 1 "graphite" } } */
+/* { dg-final { scan-tree-dump-times "1 loops carried no dependency" 1 "graphite" } } */
 /* { dg-final { cleanup-tree-dump "graphite" } } */
 /* { dg-final { scan-tree-dump-times "loopfn.0" 5 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "loopfn.1" 5 "optimized" } } */
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-7.c b/libgomp/testsuite/libgomp.graphite/force-parallel-7.c
index 0191af0..2fbe10a 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-7.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-7.c
@@ -2,29 +2,30 @@
 
 int A[N+5][N+5][N+5];
 
-int foo(void)
+void abort (void);
+
+int foo (void)
 {
   int i, j, k;
 
+  for (i = 0; i < N + 5; i++)
+    for (j = 0; j < N + 5; j++)
+      for (k = 0; k < N + 5; k++)
+	A[i][j][k] = i + j + k;
+
   /* Loop i: carried no dependency.  */
   for (i = 0; i < N; i++)
     for (j = 0; j < N; j++)
       for (k = 0; k < N; k++)
 	A[k+1][j+2][i+1] = A[k][j][i+1];
 
-  for (i = 0; i < N; i++)
-    /* Loop j: carried no dependency.  */
-    for (j = 0; j < N; j++)
-      /* Loop k: carreid no dependency.  */
-      for (k = 0; k < N; k++)
-	A[i+1][j][k] = A[i][j][k+1];
-
   return A[1][5][2];
 }
 
-int main(void)
+int main (void)
 {
-  foo();
+  if (5 != foo ())
+    abort ();
 
   return 0;
 }
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-8.c b/libgomp/testsuite/libgomp.graphite/force-parallel-8.c
index dc553f5..f9ce968 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-8.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-8.c
@@ -2,11 +2,20 @@
 
 int x[N][N], y[N];
 
+void abort (void);
+
 int foo(void)
 {
   int i, j;
 
   for (i = 0; i < N; i++)
+    y[i] = i;
+
+  for (i = 0; i < N; i++)
+    for (j = 0; j < N; j++)
+      x[i][j] = i + j;
+
+  for (i = 0; i < N; i++)
     {
       y[i] = i;
 
@@ -27,13 +36,16 @@ int foo(void)
 
 int main(void)
 {
-  foo();
+  if (168 != foo())
+    abort ();
 
   return 0;
 }
 
 /* Check that parallel code generation part make the right answer.  */
-/* { dg-final { scan-tree-dump-times "2 loops carried no dependency" 1 "graphite" } } */
+/* { dg-final { scan-tree-dump-times "1 loops carried no dependency" 1 "graphite" } } */
+/* { dg-final { scan-tree-dump-times "3 loops carried no dependency" 1 "graphite" } } */
+/* { dg-final { scan-tree-dump-times "5 loops carried no dependency" 1 "graphite" } } */
 /* { dg-final { cleanup-tree-dump "graphite" } } */
 /* { dg-final { scan-tree-dump-times "loopfn.0" 5 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "loopfn.1" 5 "optimized" } } */