Message ID | 87zj3xccqv.fsf@kepler.schwinge.homeip.net |
---|---|
State | New |
Headers | show |
diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp index 8b8243a..5cd5d06 100644 --- libgomp/ChangeLog.gomp +++ libgomp/ChangeLog.gomp @@ -1,3 +1,30 @@ +2015-06-18 Thomas Schwinge <thomas@codesourcery.com> + + * testsuite/libgomp.oacc-c++/c++.exp (check_effective_target_c): + New procedure. + * testsuite/libgomp.oacc-c/c.exp (check_effective_target_c): + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-1.c: + Tune XFAILs. + * testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-2.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-4.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-3.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-4.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-2.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-3.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-4.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-5.c: + Likewise. + * testsuite/libgomp.oacc-c-c++-common/private-vars-par-gang-3.c: + Likewise. + 2015-06-18 Tom de Vries <tom@codesourcery.com> * testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95: New test. diff --git libgomp/testsuite/libgomp.oacc-c++/c++.exp libgomp/testsuite/libgomp.oacc-c++/c++.exp index 8d8f4ff..a3d0eda 100644 --- libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -14,6 +14,10 @@ if [info exists lang_include_flags] then { unset lang_include_flags } +proc check_effective_target_c { } { + return 0 +} + # Initialize dg. dg-init diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-1.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-1.c index f8658e5..957f827 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-1.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-1.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-2.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-2.c index 925f9a0..5bf3e16 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-2.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-2.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-4.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-4.c index 4cec00e..118dae8 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-4.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-local-worker-4.c @@ -1,3 +1,4 @@ +/* { dg-xfail-if "TODO" { c } } */ /* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-3.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-3.c index 0a77869..bc96f0d 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-3.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-3.c @@ -1,3 +1,9 @@ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* Fails as of gomp-4_0-branch r224586, but for C only: + + private-vars-loop-gang-3.exe: [...]/private-vars-loop-gang-3.c:28: main: Assertion `arr[i] == i + (i / 32) * 2' failed. +*/ + #include <assert.h> /* Test of gang-private variables declared on loop directive, with broadcasting diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-4.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-4.c index 24b0059..f0f0477 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-4.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-gang-4.c @@ -1,4 +1,5 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-if "TODO: ICE" { *-*-* } } */ +/* { dg-excess-errors "TODO" } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-2.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-2.c index 834b0f1..a5f16d8 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-2.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-2.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-3.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-3.c index 18d6229..5c75f4d 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-3.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-3.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-4.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-4.c index 881bc7d..f0d1309 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-4.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-4.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-5.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-5.c index fc1535b..741795d 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-5.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-loop-worker-5.c @@ -1,4 +1,5 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-if "TODO: ICE" { *-*-* } } */ +/* { dg-excess-errors "TODO" } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-par-gang-3.c libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-par-gang-3.c index e5387c6..c580d68 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-par-gang-3.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/private-vars-par-gang-3.c @@ -1,4 +1,4 @@ -/* { dg-xfail-run-if "TODO" { openacc_nvidia_accel_selected } { "*" } { "" } } */ +/* { dg-xfail-run-if "TODO" { c && openacc_nvidia_accel_selected } { "*" } { "" } } */ #include <assert.h> diff --git libgomp/testsuite/libgomp.oacc-c/c.exp libgomp/testsuite/libgomp.oacc-c/c.exp index 8d54815..15e8f81 100644 --- libgomp/testsuite/libgomp.oacc-c/c.exp +++ libgomp/testsuite/libgomp.oacc-c/c.exp @@ -19,6 +19,10 @@ if ![info exists DEFAULT_CFLAGS] then { set DEFAULT_CFLAGS "-O2" } +proc check_effective_target_c { } { + return 1 +} + # Initialize dg. dg-init