From 3f5a3b7539e066b539e81b901687facdea4e1bac Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 25 Feb 2022 12:55:05 +0100 Subject: [PATCH] Fix 'libgomp.c/declare-variant-3-*.c' compilation for configurations where GCN offloading is enabled in addition to nvptx The GCN offloading compiler doesn't like '-misa=sm_30' etc.; restrict to '-foffload=nvptx-none' compilation only. Fix-up for commit 59b8ade88774b4dcf1691a8f650cdbb86cc30862 "[libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c". libgomp/ * testsuite/libgomp.c/declare-variant-3-sm30.c: 'dg-additional-options -foffload=nvptx-none'. * testsuite/libgomp.c/declare-variant-3-sm35.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm53.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm70.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm75.c: Likewise. * testsuite/libgomp.c/declare-variant-3-sm80.c: Likewise. --- libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c | 1 + libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c | 1 + libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c | 1 + libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c | 1 + libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c | 1 + libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c | 1 + 6 files changed, 6 insertions(+) diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c index a49bc12064a9..be5edbaf0fd1 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c @@ -1,4 +1,5 @@ /* { dg-do run { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_30 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c index 9f71acb87384..79cd8fc940da 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c @@ -1,4 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_35 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c index fa713920ce02..8d05e9efc621 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c @@ -1,4 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_53 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c index 90f0116c5820..e102c11ab447 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c @@ -1,4 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_70 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c index 86f2e72866a7..7122ccc22d18 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c @@ -1,4 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_75 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c index de208d9bdd16..5e13d876500c 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c @@ -1,4 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ +/* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_80 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ -- 2.47.2