summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2012-06-22 12:29:33 +0000
committerrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2012-06-22 12:29:33 +0000
commit479a6d791640a3d9a94e4c126df1a52a57703f11 (patch)
treec3219bcca178f5d132ff02ba16435f89fac9c6c1 /libgomp
parent45565b9d475c5868c3a5378b8e853ae2de741d93 (diff)
downloadgcc-479a6d791640a3d9a94e4c126df1a52a57703f11.tar.gz
2012-06-22 Richard Guenther <rguenther@suse.de>
Merge from graphite branch 2011-08-10 Sebastian Pop <sebpop@gmail.com> * graphite-sese-to-poly.c (build_scop_drs): Fix memory leak. 2012-01-13 Tobias Grosser <tobias@grosser.es> * tree-flow.h (parallelized_function_p): Declare. * tree-parloops.c (parallelized_function_p): Export. * graphite.c (graphite_transform_loops): Do not run graphite on already parallel functions. libgomp/ * testsuite/libgomp.graphite/force-parallel-1.c: Adjust. * testsuite/libgomp.graphite/force-parallel-2.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188885 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog8
-rw-r--r--libgomp/testsuite/libgomp.graphite/force-parallel-1.c2
-rw-r--r--libgomp/testsuite/libgomp.graphite/force-parallel-2.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index df2bfb50450..9ec6159135f 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-22 Richard Guenther <rguenther@suse.de>
+
+ Merge from graphite branch
+ 2012-01-13 Tobias Grosser <tobias@grosser.es>
+
+ * testsuite/libgomp.graphite/force-parallel-1.c: Adjust.
+ * testsuite/libgomp.graphite/force-parallel-2.c: Likewise.
+
2012-06-07 Jakub Jelinek <jakub@redhat.com>
PR middle-end/53580
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-1.c b/libgomp/testsuite/libgomp.graphite/force-parallel-1.c
index d168b438823..8c40e34dfc0 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-1.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-1.c
@@ -24,7 +24,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" 2 "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" 5 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
diff --git a/libgomp/testsuite/libgomp.graphite/force-parallel-2.c b/libgomp/testsuite/libgomp.graphite/force-parallel-2.c
index 03d823653a7..1ce0feb2506 100644
--- a/libgomp/testsuite/libgomp.graphite/force-parallel-2.c
+++ b/libgomp/testsuite/libgomp.graphite/force-parallel-2.c
@@ -23,7 +23,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" 2 "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" 5 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */