From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id B586C3858D32 for ; Thu, 30 Nov 2023 14:49:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B586C3858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B586C3858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.129.153 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701355787; cv=none; b=WLjVo8WHb4nRRzk/Bgf5Nkvp9V5Mr1EU0uyoyaY5huVSo6UIFRT2yXIOiD/DOsR39cVkRrnlG+6QmLtl6yYZ1aa/duhTssrFa3eZ8rLSBj10UI4DmD15qXkfwTt8V+fsDO7iglDQm4NEHG4jNxIZUAAHobsGhW7vPEr1Z0Z98J0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701355787; c=relaxed/simple; bh=FG4LGNCnAmhcH3u2lN/oXXSh3UYQfznnWGaapjgNgkM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ibracIx8y8XBOwgG8nFAG7RJdbi4Dv4r/RO2dlj1x6HPTCDw6Ts5Dc62frQFDACvE7QNIFp2DGFsWDhnjTTEwj2OTC0j8S28oozQNNKYqI91YJObIWY03gZo7SRZkx56BOOQyRKIO16xiKNcYLdZRxaWpO9gX8sDis/mWURfB/c= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: ALPQ7EADSx2QNjset6Fw4Q== X-CSE-MsgGUID: xX+tEvEtRQ+I21oRLSI5Yw== X-IronPort-AV: E=Sophos;i="6.04,239,1695715200"; d="scan'208,223";a="27269397" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 30 Nov 2023 06:49:44 -0800 IronPort-SDR: 7WEICOm1Cl7gvs2T7lVBazZd+Q5KGiNEVzrKjvXjqPEe23BcFsTsFJ01a3DamVhikPTGprSpM3 bczgqAv9tISRPSnVqKZof2T7M10I1AcHaeHZouNoX6qRxeT2OrJ8lC5HIsOd/6I4nU3mfhPDWr GE1asvJMh3W/Rlvl0JCP841YNnybSUGM0XkUSug/haLtbTj4XkMJFZg0yRrIGG5yB/Kjhha6gq H6SmIU1znGipTu3kj33YUPrN9clD4tR2pDd7TSmDVEqwMYnQgWm5/wogimm6YAhpAtMVwuRQWP qy0= From: Thomas Schwinge To: CC: Tom de Vries , Jakub Jelinek , Tobias Burnus Subject: Re: Fix 'libgomp.c/declare-variant-3-*.c' compilation for configurations where GCN offloading is enabled in addition to nvptx (was: [PATCH][libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c) In-Reply-To: <87h6l35mbq.fsf@euler.schwinge.homeip.net> References: <6b0f4fe5-06d4-5ede-5bd1-a53ed82f6d36@suse.de> <221e5215-3b8b-fa9f-4e7b-2faa86b8b991@codesourcery.com> <71e9c008-7ad1-c24f-76eb-6a03180525c4@suse.de> <0ce14ee6-a677-76a9-7e7a-d99d3927bd8a@suse.de> <87h6l35mbq.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 30 Nov 2023 15:49:38 +0100 Message-ID: <87cyvr5m9p.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2023-11-30T15:48:25+0100, I wrote: > On 2022-02-24T11:32:53+0100, Tom de Vries via Gcc-patches wrote: >> [libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c > > \o/ Yay for test cases! > >> --- /dev/null >> +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c >> @@ -0,0 +1,7 @@ >> +/* { dg-do run { target { offload_target_nvptx } } } */ >> +/* { dg-additional-options "-foffload=3D-misa=3Dsm_30" } */ >> +/* { dg-additional-options "-foffload=3D-fdump-tree-optimized" } */ > > Etc. > > Pushed to master branch commit 3f5a3b7539e066b539e81b901687facdea4e1bac > "Fix 'libgomp.c/declare-variant-3-*.c' compilation for configurations whe= re GCN offloading is enabled in addition to nvptx", > see attached. ..., now. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-Fix-libgomp.c-declare-variant-3-.c-compilation-for-c.patch" >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 a49bc12064a..be5edbaf0fd 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 9f71acb8738..79cd8fc940d 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 fa713920ce0..8d05e9efc62 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 90f0116c582..e102c11ab44 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 86f2e72866a..7122ccc22d1 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 de208d9bdd1..5e13d876500 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.34.1 --=-=-=--