Hi! On Tue, 8 Oct 2013 17:24:14 +0200, Jakub Jelinek <ja...@redhat.com> wrote: > These tests were expecting 5 loopfn matches, 3 on the fn definition, one > as GOMP_parallel_start argument and one called in between > GOMP_parallel_start and GOMP_parallel_end. But the new API is > to call GOMP_parallel with the function and not call the outlined > function nor GOMP_parallel_end directly, GOMP_parallel will call it > indirectly. > > 2013-10-08 Jakub Jelinek <ja...@redhat.com> > > * gcc.dg/autopar/outer-1.c: Expect 4 instead of 5 loopfn matches. > * [...]
IRC, OFTC, #gcc, 2013-10-09:
<tschwinge> jakub: On the gomp-4_0-branch as of yesterday, I'm seeing
PASS -> FAIL for some libgomp.graphite tests; looks very similar to
the loopfn changes you applied to gcc.dg/autopar tests
(GOMP_parallel interface change). Want me to have a look, or are
you going to?
<tschwinge> By the weay, I didn't mean to say that the FAIL appeared
yesterday, but that this is a test run from yesterday's sources.
<jakub> tschwinge: ah, I don't have graphite enabled (except for
release branch builds for the distro), so it is very well possible
there are some issues
<jakub> sounds sed -i -e 's/" 5 "/" 4 "/'
libgomp/testsuite/libgomp.graphite/force-parallel-*.c would cure it
<tschwinge> jakub: Yep, something like that. Will give it a try
(unless you're going to).
<jakub> tschwinge: I could easily cook up a patch, but it would be
much harder to test it for me (no isl nor cloog readily built)
<tschwinge> jakub: Testing.
OK to commit -- on gomp-4_0-branch, or trunk after your merge patches
have gone in, or are you going to fold it into the respective merge patch
(and later merge it back into gomp-4_0-branch)? Pick the one that suits
you best. ;-)
2013-10-09 Thomas Schwinge <tho...@codesourcery.com>
Jakub Jelinek <ja...@redhat.com>
libgomp/
* testsuite/libgomp.graphite/force-parallel-1.c: Expect 4 instead
of 5 loopfn matches.
* testsuite/libgomp.graphite/force-parallel-2.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-3.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-4.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-5.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-6.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-7.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-8.c: Likewise.
* testsuite/libgomp.graphite/force-parallel-9.c: Likewise.
As changed in gomp-4_0-branch, r203282.
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-1.c
libgomp/testsuite/libgomp.graphite/force-parallel-1.c
index 8c40e34..008c9d7 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-1.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-1.c
@@ -26,6 +26,6 @@ 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 { cleanup-tree-dump "graphite" } } */
-/* { dg-final { scan-tree-dump-times "loopfn" 5 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-2.c
libgomp/testsuite/libgomp.graphite/force-parallel-2.c
index 1ce0feb..f80401b 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-2.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-2.c
@@ -25,6 +25,6 @@ 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 { cleanup-tree-dump "graphite" } } */
-/* { dg-final { scan-tree-dump-times "loopfn" 5 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-3.c
libgomp/testsuite/libgomp.graphite/force-parallel-3.c
index ff8680b..4a2d323 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-3.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-3.c
@@ -32,7 +32,7 @@ int main(void)
/* Check that parallel code generation part make the right answer. */
/* { dg-final { scan-tree-dump-times "4 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" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.1" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-4.c
libgomp/testsuite/libgomp.graphite/force-parallel-4.c
index 825bda5..0bfb0d0 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-4.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-4.c
@@ -50,7 +50,7 @@ int main(void)
/* { 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" } } */
-/* { dg-final { scan-tree-dump-times "loopfn.1" 5 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.1" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-5.c
libgomp/testsuite/libgomp.graphite/force-parallel-5.c
index 5c944dc..4912d47 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-5.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-5.c
@@ -33,7 +33,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 { cleanup-tree-dump "graphite" } } */
-/* { dg-final { scan-tree-dump-times "loopfn.0" 5 "optimized" } } */
-/* { dg-final { scan-tree-dump-times "loopfn.1" 5 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.1" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-6.c
libgomp/testsuite/libgomp.graphite/force-parallel-6.c
index d04c120..5071630 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-6.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-6.c
@@ -34,6 +34,6 @@ 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 { cleanup-tree-dump "graphite" } } */
-/* { dg-final { scan-tree-dump-times "loopfn.0" 5 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-7.c
libgomp/testsuite/libgomp.graphite/force-parallel-7.c
index 2fbe10a..04dd01d 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-7.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-7.c
@@ -33,6 +33,6 @@ int main (void)
/* Check that parallel code generation part make the right answer. */
/* { dg-final { scan-tree-dump-times "3 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.0" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-8.c
libgomp/testsuite/libgomp.graphite/force-parallel-8.c
index f9ce968..e2ed0ec 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-8.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-8.c
@@ -47,7 +47,7 @@ int main(void)
/* { 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" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.1" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git libgomp/testsuite/libgomp.graphite/force-parallel-9.c
libgomp/testsuite/libgomp.graphite/force-parallel-9.c
index 1de43c3..e000880 100644
--- libgomp/testsuite/libgomp.graphite/force-parallel-9.c
+++ libgomp/testsuite/libgomp.graphite/force-parallel-9.c
@@ -31,7 +31,7 @@ int main(void)
/* Check that parallel code generation part make the right answer. */
/* { dg-final { scan-tree-dump-times "4 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" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.0" 4 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "loopfn.1" 4 "optimized" } } */
/* { dg-final { cleanup-tree-dump "parloops" } } */
/* { dg-final { cleanup-tree-dump "optimized" } } */
Comparing trunk (revision corresponding to last merge into
gomp-4_0-branch) to gomp-4_0-branch, a few FAILs remain, but these are
not regressions:
Running [...]/libgomp/testsuite/libgomp.graphite/graphite.exp ...
FAIL: libgomp.graphite/bounds.c scan-tree-dump-times graphite "0 loops
carried no dependency" 1
FAIL: libgomp.graphite/force-parallel-4.c execution test
FAIL: libgomp.graphite/force-parallel-4.c scan-tree-dump-times graphite "2
loops carried no dependency" 1
FAIL: libgomp.graphite/force-parallel-6.c scan-tree-dump-times graphite "1
loops carried no dependency" 1
FAIL: libgomp.graphite/pr41118.c scan-tree-dump-times optimized "loopfn" 0
I'm not currently planning to work on resolving these.
Grüße,
Thomas
pgp1rFvJsOPip.pgp
Description: PGP signature
