From 92d5d01ac65e395ceaecc5d930f6017952aa4934 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 16 Oct 2017 08:44:42 +0000 Subject: [PATCH] Enable libgomp.oacc-*/declare-*.{c,f90} for non-nvidia devices 2017-10-16 Tom de Vries * 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 --- libgomp/ChangeLog | 14 ++++++++++++++ .../libgomp.oacc-c-c++-common/declare-1.c | 2 -- .../libgomp.oacc-c-c++-common/declare-2.c | 2 -- .../libgomp.oacc-c-c++-common/declare-4.c | 2 -- .../libgomp.oacc-c-c++-common/declare-5.c | 2 +- .../testsuite/libgomp.oacc-fortran/declare-1.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/declare-2.f90 | 2 -- .../testsuite/libgomp.oacc-fortran/declare-3.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/declare-4.f90 | 2 -- .../testsuite/libgomp.oacc-fortran/declare-5.f90 | 2 -- 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 + + * 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 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 #include #include 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 #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 #include 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 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 -- 2.30.2