summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorvries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-16 08:44:42 +0000
committervries <vries@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-16 08:44:42 +0000
commitbf25f4227297a9ba3a1c01970a6e38f792445ecb (patch)
treeb68a50249f9bbb0f4be4d7d191584a58a10426cc /libgomp
parentde44fcf0124e86eeadd4087b249ec13bb3b5f1aa (diff)
downloadgcc-bf25f4227297a9ba3a1c01970a6e38f792445ecb.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253779 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog14
-rw-r--r--libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c2
-rw-r--r--libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c2
-rw-r--r--libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c2
-rw-r--r--libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c2
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/declare-1.f902
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/declare-2.f902
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/declare-3.f902
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/declare-4.f902
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/declare-5.f902
10 files changed, 17 insertions, 15 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1c5c5a9a912..a5af03b0202 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 c63a68dbab7..bc726174252 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 2078a33afa9..d212458dada 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 36bf0ebdd0b..ca48e801314 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 38c5de063d9..229e96c08a0 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 2d4b70720e3..ca8831ef213 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 2aa79079d91..aeea10a69f3 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 3a6b420f1c7..88b9aff82e9 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 226264e38c1..252c4ff6687 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 bcd9c9c72b5..e91f26b13ab 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