From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id BC3AE3844051; Tue, 8 Jun 2021 09:26:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC3AE3844051 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1286] Don't require 'openacc_nvidia_accel_selected' in 'libgomp.oacc-c-c++-common/async_queue-1.c' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/master X-Git-Oldrev: 77f41a5c4e60a88533c90f0948b4dd24c9bb88b2 X-Git-Newrev: 89c1a427a1cfdb38e4b2354eeb1e28e0042af54c Message-Id: <20210608092640.BC3AE3844051@sourceware.org> Date: Tue, 8 Jun 2021 09:26:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 09:26:40 -0000 https://gcc.gnu.org/g:89c1a427a1cfdb38e4b2354eeb1e28e0042af54c commit r12-1286-g89c1a427a1cfdb38e4b2354eeb1e28e0042af54c Author: Thomas Schwinge Date: Fri Jun 4 15:27:55 2021 +0200 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'. Diff: --- libgomp/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);