diff mbox series

[libgomp,testsuite,committed] Allow asyncwait-1.c to run for non-nvidia devices

Message ID 81b46cb1-a6e4-4d6c-647f-58fb64a9d1d4@mentor.com
State New
Headers show
Series [libgomp,testsuite,committed] Allow asyncwait-1.c to run for non-nvidia devices | expand

Commit Message

Tom de Vries Nov. 14, 2017, 9:23 a.m. UTC 
Hi,

this patch allows openacc test-case asyncwait-1.c to run for non-nvidia 
devices.

Committed as obvious.

Thanks,
- Tom
diff mbox series

Patch

Allow asyncwait-1.c to run for non-nvidia devices

2017-11-14  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c: Allow to run for
	non-nvidia devices.

---
 .../testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c
index d478ce2..e780845 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c
@@ -1,9 +1,11 @@ 
-/* { dg-do run { target openacc_nvidia_accel_selected } } */
-/* { dg-additional-options "-lcuda" } */
+/* { dg-do run } */
+/* { dg-additional-options "-lcuda" { target openacc_nvidia_accel_selected } } */
 
 #include <openacc.h>
 #include <stdlib.h>
+#if defined ACC_DEVICE_TYPE_nvidia
 #include "cuda.h"
+#endif
 
 #include <stdio.h>
 #include <sys/time.h>
@@ -11,14 +13,18 @@ 
 int
 main (int argc, char **argv)
 {
+#if defined ACC_DEVICE_TYPE_nvidia
     CUresult r;
     CUstream stream1;
+#endif
     int N = 128; //1024 * 1024;
     float *a, *b, *c, *d, *e;
     int i;
     int nbytes;
 
+#if defined ACC_DEVICE_TYPE_nvidia
     acc_init (acc_device_nvidia);
+#endif
 
     nbytes = N * sizeof (float);
 
@@ -210,6 +216,7 @@  main (int argc, char **argv)
     }
 
 
+#if defined ACC_DEVICE_TYPE_nvidia
     r = cuStreamCreate (&stream1, CU_STREAM_NON_BLOCKING);
     if (r != CUDA_SUCCESS)
     {
@@ -218,6 +225,7 @@  main (int argc, char **argv)
     }
 
     acc_set_cuda_stream (1, stream1);
+#endif
 
     for (i = 0; i < N; i++)
     {
@@ -642,6 +650,7 @@  main (int argc, char **argv)
     }
 
 
+#if defined ACC_DEVICE_TYPE_nvidia
     r = cuStreamCreate (&stream1, CU_STREAM_NON_BLOCKING);
     if (r != CUDA_SUCCESS)
     {
@@ -650,6 +659,7 @@  main (int argc, char **argv)
     }
 
     acc_set_cuda_stream (1, stream1);
+#endif
 
     for (i = 0; i < N; i++)
     {
@@ -892,7 +902,9 @@  main (int argc, char **argv)
             abort ();
     }
 
+#if defined ACC_DEVICE_TYPE_nvidia
     acc_shutdown (acc_device_nvidia);
+#endif
 
     return 0;
 }