From f9da798ba6348feaada80de04bc72cdf0c4a1f70 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 4 Jun 2021 15:19:35 +0200 Subject: [PATCH] [GCN] Streamline 'libgomp/testsuite/lib/libgomp.exp:check_effective_target_openacc_radeon_accel_selected' The GCN support that got added in r278935 (commit 83caa34e2a618842e05f59cbb3e2dda93dc23270) "Enable OpenACC GCN testing" was forked before my r269107 (commit ee332b4a9a19552d160a23155f59b11692d8f07e) "[libgomp] Clarify difference between offload target, offload plugin, and OpenACC device type", and didn't later pick up these changes. No functional change. libgomp/ * testsuite/lib/libgomp.exp (check_effective_target_openacc_radeon_accel_selected): Streamline. --- libgomp/testsuite/lib/libgomp.exp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 0f4eb6fd4ff2..45c78d8510e9 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -472,11 +472,8 @@ proc check_effective_target_openacc_radeon_accel_selected { } { if { ![check_effective_target_openacc_radeon_accel_present] } { return 0; } - global offload_target - if { [string match "amdgcn*" $offload_target] } { - return 1; - } - return 0; + global openacc_device_type + return [string match "radeon" $openacc_device_type] } # Return 1 if cuda.h and -lcuda are available. -- 2.47.2