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

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1c5c5a9a912c1ab6b2b8a29fad22bddd9074a2fa..a5af03b0202a512e8c446c728b44bdf6194a5199 100644 (file)
--- 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 c63a68dbab75adaeffd373a296045e4b683c839b..bc726174252d4c0cedd0ecfbdbd759ab52d2d811 100644 (file)
--- 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 2078a33afa95b4d4c3465bc48a36771342af6af7..d212458dada960847694a2b06278f9dfcf5ed224 100644 (file)
--- 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 36bf0ebdd0b3ced4e3efaf229db97727392572da..ca48e801314eae2d9925013b85e1b98905275470 100644 (file)
--- 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 38c5de063d935b5f2f4fa56d0558b93f30d42f78..229e96c08a0d96ae706ecf0b45b5fba4afd7a199 100644 (file)
--- 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 2d4b70720e3d5d0f77bf7ec2121112d7d6d29224..ca8831ef213862b8e8921abf5de7f6e4090de17c 100644 (file)
--- 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 2aa79079d91170bdf22112516c250de61ed70be6..aeea10a69f36897c800be2b0ad116a1c45245432 100644 (file)
--- 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 3a6b420f1c7a2f1881ddbe5ae26b1f93c00f4ba9..88b9aff82e9e0b429cde87fa65354f854a1b406e 100644 (file)
--- 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 226264e38c11d2dabb3342732070efdff04d86ee..252c4ff668798814d57fab070e08e0754c9ece32 100644 (file)
--- 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 bcd9c9c72b53fb0c082b9f40703ef464dfecf8af..e91f26b13ab3dfff63610e461433b0edb4803177 100644 (file)
--- 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