libgomp: libgomp.oacc-c-c++-common/lib-62.c is for acc_device_nvidia only (was: OpenACC: initialization with unsupported acc_device_t)

[Thomas Schwinge]

Hi!

On Tue, 5 May 2015 16:09:18 +0200, I wrote:
> I don't know why libgomp.oacc-c-c++-common/lib-62.c contains this
> explicit acc_init call with acc_device_nvidia -- generally, the test
> cases should not contain such unconditional statements.  So, let's then
> please remove this.  See
> libgomp/testsuite/libgomp.oacc-c-c++-common/lib-66.c for a very similar
> test case, which does this differently.

Committed in r224640:

commit 3625ad60ab1ad783f4afead68f44b19011e4780d
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Jun 19 07:41:44 2015 +0000

    libgomp: libgomp.oacc-c-c++-common/lib-62.c is for acc_device_nvidia only
    
        libgomp/
        * testsuite/libgomp.oacc-c-c++-common/lib-62.c: Only consider for
        acc_device_nvidia.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224640 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgomp/ChangeLog                                    |    3 +++
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c |    6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git libgomp/ChangeLog libgomp/ChangeLog
index d49b056..cf1a0b0 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,5 +1,8 @@
 2015-06-19  Thomas Schwinge  <tho...@codesourcery.com>
 
+       * testsuite/libgomp.oacc-c-c++-common/lib-62.c: Only consider for
+       acc_device_nvidia.
+
        PR libgomp/66518
        * testsuite/libgomp.oacc-c-c++-common/lib-3.c: XFAIL.
        * testsuite/libgomp.oacc-c-c++-common/lib-42.c: Likewise.
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c 
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
index 47dc953..2988b5b 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
 
 #include <string.h>
 #include <stdlib.h>
@@ -12,8 +12,6 @@ main (int argc, char **argv)
   unsigned char *h;
   void *d;
 
-  acc_init (acc_device_nvidia);
-
   h = (unsigned char *) malloc (N);
 
   for (i = 0; i < N; i++)
@@ -41,8 +39,6 @@ main (int argc, char **argv)
 
   free (h);
 
-  acc_shutdown (acc_device_nvidia);
-
   return 0;
 }
 


Grüße,
 Thomas

signature.asc
Description: PGP signature