From 89c1a427a1cfdb38e4b2354eeb1e28e0042af54c Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 4 Jun 2021 15:27:55 +0200 Subject: [PATCH] Don't require 'openacc_nvidia_accel_selected' in 'libgomp.oacc-c-c++-common/async_queue-1.c' 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'. --- .../testsuite/libgomp.oacc-c-c++-common/async_queue-1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/async_queue-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/async_queue-1.c index 4f9e53da85d..533d498bcf7 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/async_queue-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/async_queue-1.c @@ -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); -- 2.30.2