[og12] Fix 'libgomp.c/simd-math-1.c' configuration, again (was: [og12] Fix 'libgomp.c/simd-math-1.c' configuration (was: [OG12] [committed] amdgcn: Enable SIMD vectorization of math library functions))

[Thomas Schwinge <thomas@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 927 bytes --]

Hi!

On 2023-01-20T15:16:26+0100, I wrote:
> On 2022-11-02T00:50:40+0000, Kwok Cheung Yeung <kcy@codesourcery.com> wrote:
>> I have committed the following patches onto the devel/omp/gcc-12
>> development branch:
>>
>> 863579c4e30 amdgcn: Enable SIMD vectorization of math functions
>
> I've pushed to devel/omp/gcc-12
> commit e7d4bcb974915bfe95be6c385641fc66a4201581
> "Fix 'libgomp.c/simd-math-1.c' configuration", see attached.

I've pushed to devel/omp/gcc-12
commit bbd4eb1772893ba99aa23a4eaf8950415624964e
"Fix 'libgomp.c/simd-math-1.c' configuration, again", see attached.

Thanks for the report, Tobias!


Grüße
 Thomas


-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-libgomp.c-simd-math-1.c-configuration-again.patch --]
[-- Type: text/x-diff, Size: 1888 bytes --]

From bbd4eb1772893ba99aa23a4eaf8950415624964e Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 20 Jan 2023 17:17:21 +0100
Subject: [PATCH] Fix 'libgomp.c/simd-math-1.c' configuration, again

Tobias pointed out that as of my recent
og12 commit e7d4bcb974915bfe95be6c385641fc66a4201581
"Fix 'libgomp.c/simd-math-1.c' configuration",
in GCC configurations without GCN offloading configured, we'd get:

    xgcc: error: GCC is not configured to support 'amdgcn-amdhsa' as '-foffload=' argument

("Interestingly", GCC doesn't complain for '-foffload-options=-lm' if there are
no offload targets configured...)

	libgomp/
	* testsuite/libgomp.c/simd-math-1.c: Fix configuration, again.
---
 libgomp/ChangeLog.omp                     | 2 ++
 libgomp/testsuite/libgomp.c/simd-math-1.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 0f8fca4e71c..134d450f44a 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,7 @@
 2023-01-20  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* testsuite/libgomp.c/simd-math-1.c: Fix configuration, again.
+
 	* testsuite/libgomp.oacc-c-c++-common/abort-3.c: Force
 	'--param openacc-kernels=parloops'.
 
diff --git a/libgomp/testsuite/libgomp.c/simd-math-1.c b/libgomp/testsuite/libgomp.c/simd-math-1.c
index 1ebdccccfeb..ea629696e55 100644
--- a/libgomp/testsuite/libgomp.c/simd-math-1.c
+++ b/libgomp/testsuite/libgomp.c/simd-math-1.c
@@ -3,7 +3,7 @@
 
 /* { dg-do run } */
 /* { dg-options "-O2 -ftree-vectorize -fno-math-errno" } */
-/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mstack-size=3000000 } */
+/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mstack-size=3000000 { target offload_target_amdgcn } } */
 /* { dg-additional-options -foffload-options=-lm } */
 
 #undef PRINT_RESULT
-- 
2.25.1