[gcc/devel/omp/gcc-12] Fix 'libgomp.c/simd-math-1.c' configuration

[gcc/devel/omp/gcc-12] Fix 'libgomp.c/simd-math-1.c' configuration

[Thomas Schwinge]

https://gcc.gnu.org/g:e7d4bcb974915bfe95be6c385641fc66a4201581

commit e7d4bcb974915bfe95be6c385641fc66a4201581
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Sat Jan 14 10:28:09 2023 +0100

    Fix 'libgomp.c/simd-math-1.c' configuration
    
    If nvptx offloading is configured in addition to GCN, we see:
    
        FAIL: libgomp.c/simd-math-1.c (test for excess errors)
        UNRESOLVED: libgomp.c/simd-math-1.c compilation failed to produce executable
    
        x86_64-pc-linux-gnu-accel-nvptx-none-gcc: error: unrecognized command-line option '-mstack-size=3000000'
    
    Thus, restrict that ooption to GCN offloading compilation, and on the other
    hand, there's no reason to skip this test for non-GCN offloading execution:
    even if not SIMD-vectorized there, we still benefit from correctness testing.
    
            libgomp/
            * testsuite/libgomp.c/simd-math-1.c: Fix configuration.

Diff:
---
 libgomp/ChangeLog.omp                     | 4 ++++
 libgomp/testsuite/libgomp.c/simd-math-1.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 629efbc5832..23e93495b62 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,7 @@
+2023-01-20  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* testsuite/libgomp.c/simd-math-1.c: Fix configuration.
+
 2023-01-19  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/libgomp/testsuite/libgomp.c/simd-math-1.c b/libgomp/testsuite/libgomp.c/simd-math-1.c
index caf032a77ae..1ebdccccfeb 100644
--- a/libgomp/testsuite/libgomp.c/simd-math-1.c
+++ b/libgomp/testsuite/libgomp.c/simd-math-1.c
@@ -2,9 +2,9 @@
    sufficiently close) results as their scalar equivalents.  */
 
 /* { dg-do run } */
-/* { dg-skip-if "AMD GCN only" { ! amdgcn_offloading_enabled } } */
 /* { dg-options "-O2 -ftree-vectorize -fno-math-errno" } */
-/* { dg-additional-options "-foffload=-mstack-size=3000000 -foffload=-lm" } */
+/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mstack-size=3000000 } */
+/* { dg-additional-options -foffload-options=-lm } */
 
 #undef PRINT_RESULT
 #define VERBOSE 0