]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Don't require 'openacc_nvidia_accel_selected' in 'libgomp.oacc-c-c++-common/async_que...
authorThomas Schwinge <thomas@codesourcery.com>
Fri, 4 Jun 2021 13:27:55 +0000 (15:27 +0200)
committerThomas Schwinge <thomas@codesourcery.com>
Tue, 8 Jun 2021 09:23:31 +0000 (11:23 +0200)
That is, re-enable it for host-fallback, and enable it for GCN offloading.

Fix-up for r279378 (commit 26b74ed0223d108d7d7818c3c860f20cfe81a4af)
"Update OpenACC tests for amdgcn".

libgomp/
* testsuite/libgomp.oacc-c-c++-common/async_queue-1.c: Don't
require 'openacc_nvidia_accel_selected'.  Fix up for
'ACC_DEVICE_TYPE_radeon'.

libgomp/testsuite/libgomp.oacc-c-c++-common/async_queue-1.c

index 4f9e53da85d0b89ec5ef309bb622d3ac1472ffb4..533d498bcf75b69001c4c4082fbd74276689867a 100644 (file)
@@ -1,5 +1,3 @@
-/* { dg-do run { target openacc_nvidia_accel_selected } } */
-
 /* Test mapping of async values to specific underlying queues.  */
 
 #undef NDEBUG
@@ -29,6 +27,8 @@ int main(void)
   acc_device_t d;
 #if defined ACC_DEVICE_TYPE_nvidia
   d = acc_device_nvidia;
+#elif defined ACC_DEVICE_TYPE_radeon
+  d = acc_device_radeon;
 #elif defined ACC_DEVICE_TYPE_host
   d = acc_device_host;
 #else
@@ -88,6 +88,9 @@ int main(void)
        assert (queues[i].cuda_stream == NULL);
       else
        assert (queues[i].cuda_stream != NULL);
+#elif defined ACC_DEVICE_TYPE_radeon
+      /* For "acc_device_radeon" there are no CUDA streams.  */
+      assert (queues[i].cuda_stream == NULL);
 #elif defined ACC_DEVICE_TYPE_host
       /* For "acc_device_host" there are no CUDA streams.  */
       assert (queues[i].cuda_stream == NULL);