diff options
| author | Tom de Vries <tom@codesourcery.com> | 2017-10-16 08:44:42 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2017-10-16 08:44:42 +0000 |
| commit | 92d5d01ac65e395ceaecc5d930f6017952aa4934 (patch) | |
| tree | b68a50249f9bbb0f4be4d7d191584a58a10426cc | |
| parent | 126c1ea158ebd9ecead98bb8ec61e55ba15d57eb (diff) | |
| download | gcc-92d5d01ac65e395ceaecc5d930f6017952aa4934.zip gcc-92d5d01ac65e395ceaecc5d930f6017952aa4934.tar.gz gcc-92d5d01ac65e395ceaecc5d930f6017952aa4934.tar.bz2 | |
Enable libgomp.oacc-*/declare-*.{c,f90} for non-nvidia devices
2017-10-16 Tom de Vries <tom@codesourcery.com>
* testsuite/libgomp.oacc-c-c++-common/declare-1.c: Don't require
openacc_nvidia_accel_selected.
* testsuite/libgomp.oacc-c-c++-common/declare-2.c: Same.
* testsuite/libgomp.oacc-c-c++-common/declare-4.c: Same.
* testsuite/libgomp.oacc-fortran/declare-2.f90: Same.
* testsuite/libgomp.oacc-fortran/declare-4.f90: Same
* testsuite/libgomp.oacc-fortran/declare-5.f90: Same.
* testsuite/libgomp.oacc-c-c++-common/declare-5.c: Don't require
openacc_nvidia_accel_selected. Skip for shared memory device.
* testsuite/libgomp.oacc-fortran/declare-1.f90: Same.
* testsuite/libgomp.oacc-fortran/declare-3.f90: Same.
From-SVN: r253779
10 files changed, 17 insertions, 15 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 1c5c5a9..a5af03b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,17 @@ +2017-10-16 Tom de Vries <tom@codesourcery.com> + + * testsuite/libgomp.oacc-c-c++-common/declare-1.c: Don't require + openacc_nvidia_accel_selected. + * testsuite/libgomp.oacc-c-c++-common/declare-2.c: Same. + * testsuite/libgomp.oacc-c-c++-common/declare-4.c: Same. + * testsuite/libgomp.oacc-fortran/declare-2.f90: Same. + * testsuite/libgomp.oacc-fortran/declare-4.f90: Same + * testsuite/libgomp.oacc-fortran/declare-5.f90: Same. + * testsuite/libgomp.oacc-c-c++-common/declare-5.c: Don't require + openacc_nvidia_accel_selected. Skip for shared memory device. + * testsuite/libgomp.oacc-fortran/declare-1.f90: Same. + * testsuite/libgomp.oacc-fortran/declare-3.f90: Same. + 2017-10-09 Martin Jambor <mjambor@suse.cz> PR hsa/82416 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c index c63a68d..bc7261742 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include <openacc.h> #include <stdlib.h> #include <stdio.h> diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c index 2078a33..d212458 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include <stdlib.h> #define N 16 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c index 36bf0eb..ca48e80 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include <stdlib.h> #include <openacc.h> diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c index 38c5de0..229e96c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c @@ -1,4 +1,4 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ #include <stdio.h> diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 index 2d4b707..ca8831e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 @@ -1,4 +1,4 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } +! { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } ! Tests to exercise the declare directive along with ! the clauses: copy diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 index 2aa7907..aeea10a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module globalvars implicit none integer a diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 index 3a6b420..88b9aff 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 @@ -1,4 +1,4 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } +! { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } module globalvars implicit none diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 index 226264e..252c4ff 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module vars implicit none real b diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 index bcd9c9c..e91f26b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module vars implicit none real b |