From patchwork Thu Feb 16 20:50:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 65132 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B9498385B536 for ; Thu, 16 Feb 2023 20:51:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 0AE0A3858D33 for ; Thu, 16 Feb 2023 20:50:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0AE0A3858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,302,1669104000"; d="scan'208,223";a="97125004" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 16 Feb 2023 12:50:39 -0800 IronPort-SDR: fcdnwYO8U+LNSxkAO3KdVWWeuUJ6uqP0ebd9H7rBqrahJOP8t+OrsQ9Wvk1WNEMf98zKuNEWBG RfkoFKCWUpWxSGX0NFxifW51ibDqhOflzD3IqQYzRWICm10DYIXN7tE9ExDoABNIB//AV+rpl0 AHytse4D19pSfVzhWIShRXoxm3dHxXGvwROHmXC7XGKQVTPihS1MTH59Sl5vRovKyCGkLgewnU mWp4ypQ4mEOuv+1zBXYcN6Om0QxH1RFDLbo9TveLCRNBetKnbkw0mr6UJP3p3i2p410JqNcirm /w0= From: Thomas Schwinge To: Andrew Stubbs , Subject: [og12] 'libgomp.c/usm-{1,2,3,4}.c': Re-enable non-GCN offloading compilation (was: [OG12 commit] amdgcn, libgomp: USM allocation update) In-Reply-To: <7bb722dc-0e73-dce2-d05f-d471663366a4@codesourcery.com> References: <7bb722dc-0e73-dce2-d05f-d471663366a4@codesourcery.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 16 Feb 2023 21:50:30 +0100 Message-ID: <873575z65l.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2022-10-24T17:26:44+0100, Andrew Stubbs wrote: > I've committed this patch to the devel/omp/gcc-12 branch. > --- a/libgomp/testsuite/libgomp.c/usm-1.c > +++ b/libgomp/testsuite/libgomp.c/usm-1.c > --- a/libgomp/testsuite/libgomp.c/usm-2.c > +++ b/libgomp/testsuite/libgomp.c/usm-2.c > --- a/libgomp/testsuite/libgomp.c/usm-3.c > +++ b/libgomp/testsuite/libgomp.c/usm-3.c > --- a/libgomp/testsuite/libgomp.c/usm-4.c > +++ b/libgomp/testsuite/libgomp.c/usm-4.c > @@ -1,5 +1,6 @@ > /* { dg-do run } */ > /* { dg-require-effective-target omp_usm } */ > +/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ I've pushed to devel/omp/gcc-12 branch commit b4d4603df3fed290ccf721899be6bc69f037fe2b "'libgomp.c/usm-{1,2,3,4}.c': Re-enable non-GCN offloading compilation", see attached. 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 From b4d4603df3fed290ccf721899be6bc69f037fe2b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 14 Feb 2023 18:57:04 +0100 Subject: [PATCH] 'libgomp.c/usm-{1,2,3,4}.c': Re-enable non-GCN offloading compilation Change '-foffload=amdgcn-amdhsa=[...]' to '-foffload-options=amdgcn-amdhsa=[...]', so that non-GCN offloading compilation doesn't get disabled. Fix-up for og12 commit 6ec2c29dbbc19e7d2a8f991a5848e10c65c7c74c "amdgcn, libgomp: USM allocation update". libgomp/ * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading compilation. * testsuite/libgomp.c/usm-2.c: Likewise. * testsuite/libgomp.c/usm-3.c: Likewise. * testsuite/libgomp.c/usm-4.c: Likewise. --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/testsuite/libgomp.c/usm-1.c | 2 +- libgomp/testsuite/libgomp.c/usm-2.c | 2 +- libgomp/testsuite/libgomp.c/usm-3.c | 2 +- libgomp/testsuite/libgomp.c/usm-4.c | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 2a20516cd09..ecc14b4f537 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2023-02-16 Thomas Schwinge + + * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading + compilation. + * testsuite/libgomp.c/usm-2.c: Likewise. + * testsuite/libgomp.c/usm-3.c: Likewise. + * testsuite/libgomp.c/usm-4.c: Likewise. + 2023-02-16 Tobias Burnus Backported from master: diff --git a/libgomp/testsuite/libgomp.c/usm-1.c b/libgomp/testsuite/libgomp.c/usm-1.c index f7bf897b839..35f37de7542 100644 --- a/libgomp/testsuite/libgomp.c/usm-1.c +++ b/libgomp/testsuite/libgomp.c/usm-1.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-2.c b/libgomp/testsuite/libgomp.c/usm-2.c index 3f52adbd7e1..783075edb54 100644 --- a/libgomp/testsuite/libgomp.c/usm-2.c +++ b/libgomp/testsuite/libgomp.c/usm-2.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-3.c b/libgomp/testsuite/libgomp.c/usm-3.c index 225cba5fe58..733f0f34090 100644 --- a/libgomp/testsuite/libgomp.c/usm-3.c +++ b/libgomp/testsuite/libgomp.c/usm-3.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include diff --git a/libgomp/testsuite/libgomp.c/usm-4.c b/libgomp/testsuite/libgomp.c/usm-4.c index d4addfc587a..5bf99df3b24 100644 --- a/libgomp/testsuite/libgomp.c/usm-4.c +++ b/libgomp/testsuite/libgomp.c/usm-4.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target omp_usm } */ -/* { dg-options "-foffload=amdgcn-amdhsa=-mxnack=on" { target offload_target_amdgcn } } */ +/* { dg-additional-options -foffload-options=amdgcn-amdhsa=-mxnack=on { target offload_target_amdgcn } } */ #include #include -- 2.25.1