Hi!
On 2021-05-07T12:05:11+0200, Tobias Burnus <tob...@codesourcery.com> wrote:
> --- /dev/null
> +++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c
> @@ -0,0 +1,193 @@
> +/* { dg-additional-options "-foffload=-latomic" { target {
> offload_target_nvptx } } } */
> --- /dev/null
> +++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c
> @@ -0,0 +1,196 @@
> +/* { dg-additional-options "-foffload=-latomic" { target {
> offload_target_nvptx } } } */
Causes issues if more than nvptx offloading compilation is enabled. Thus
pushed "'libgomp.c-c++-common/reduction-{5,6}.c': Restrict '-latomic' to
nvptx offloading compilation" to master branch in commit
937fa5fb7840c19c96b1fdf1ce678699649a6c5e, see attached.
Grüße
Thomas
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 München
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Frank
Thürauf
>From 937fa5fb7840c19c96b1fdf1ce678699649a6c5e Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Mon, 17 May 2021 08:05:40 +0200
Subject: [PATCH] 'libgomp.c-c++-common/reduction-{5,6}.c': Restrict '-latomic'
to nvptx offloading compilation
Fix-up for recent commit 33b647956caa977d1ae489f9baed9cef70b4f382
"OpenMP: Fix SIMT for complex/float reduction with && and ||"; see
commit d42088e453042f4f8ba9190a7e29efd937ea2181 "Avoid -latomic for amdgcn
offloading".
libgomp/
* testsuite/libgomp.c-c++-common/reduction-5.c: Restrict
'-latomic' to nvptx offloading compilation.
* testsuite/libgomp.c-c++-common/reduction-6.c: Likewise.
---
libgomp/testsuite/libgomp.c-c++-common/reduction-5.c | 2 +-
libgomp/testsuite/libgomp.c-c++-common/reduction-6.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c b/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c
index 21540512e23..31fa2670312 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c
@@ -1,4 +1,4 @@
-/* { dg-additional-options "-foffload=-latomic" { target { offload_target_nvptx } } } */
+/* { dg-additional-options "-foffload=nvptx-none=-latomic" { target { offload_target_nvptx } } } */
/* C / C++'s logical AND and OR operators take any scalar argument
which compares (un)equal to 0 - the result 1 or 0 and of type int.
diff --git a/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c b/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c
index 27d9ef6b635..727e11e4edf 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c
@@ -1,4 +1,4 @@
-/* { dg-additional-options "-foffload=-latomic" { target { offload_target_nvptx } } } */
+/* { dg-additional-options "-foffload=nvptx-none=-latomic" { target { offload_target_nvptx } } } */
/* C / C++'s logical AND and OR operators take any scalar argument
which compares (un)equal to 0 - the result 1 or 0 and of type int.
--
2.30.2
