From patchwork Fri Mar 4 19:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 51591 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 471333857C49 for ; Fri, 4 Mar 2022 19:53:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 1B51F3858D39; Fri, 4 Mar 2022 19:52:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B51F3858D39 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.90,156,1643702400"; d="scan'208,223";a="75318983" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 04 Mar 2022 11:52:49 -0800 IronPort-SDR: nfvVZxYWcdkQqXyZS4/fR7jTr22k5Ru1Yiz/Kd5Mvn6p5UGe9jrDxceG+ejleg1gyAXEBKmsNa ILJpZOo8sGDLZmIg0EZgQ7AcGiMmdUYKqReEIH20+t6kuqkzkgU6aeatmckBhb+EVKf24U6waL SIy4H/75rnF+jktlPtI5Xm9TeGKRvzwSlVHnubFiZNIC8kSvC3bP9u3Ifl6sSok3bu2R8EO7rY oHSFnes5XoV0SObANj9ko0XwLQIuuoFy6ZfvyEu1MlYYRrJ76L1fphrwT0vvO6IB3QFKuG1LqA WV4= From: Thomas Schwinge To: Subject: In-Reply-To: <877d99omoe.fsf@euler.schwinge.homeip.net> References: <20190508145157.08beb4df@squid.athome> <87iluovu47.fsf@euler.schwinge.homeip.net> <87zgm9mxib.fsf@euler.schwinge.homeip.net> <877d99omoe.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Fri, 4 Mar 2022 20:52:37 +0100 Message-ID: <877d99lcl6.fsf@dem-tschwing-1.ger.mentorg.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_BLANKSUBJECT, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , Cc: Jakub Jelinek , fortran@gcc.gnu.org, asolokha@gmx.com, Julian Brown , seurer@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2022-03-04T14:46:25+0100, I wrote: > Pushed to master branch commit 8935589b496f755e08cadf26d8ceddf0dd6e0968 > "OMP lowering: Regimplify 'OMP_CLAUSE_MAP_DECL_MAKE_ADDRESSABLE' DECLs > [PR100280, PR104132, PR104133]", see attached. > --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c > +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c > [...] > @@ -27,8 +31,12 @@ int main() > (volatile int *) &a; > #define N 123 > int b[N] = { 0 }; > + unsigned long long f1; > + /*TODO See above. */ > + (volatile void *) &f1; Ah, the famous last-minute change just before 'git push'... To work around execution failure with GCN offloading, we're explicitly making 'f1' addressable here -- but I didn't realize that this also affects diagnostics, sorry. Pushed to master branch commit 14dfbb53594e164fe222476523a68039a8bd5252 "Fix 'libgomp.oacc-c-c++-common/kernels-decompose-1.c' expected diagnostics", see attached. Grüße Thomas > > #pragma acc kernels /* { dg-line l_compute[incr c_compute] } */ > + /* { dg-note {variable 'g2\.0' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */ > { > [...] > + /* { dg-note {beginning 'gang-single' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 } */ > + f1 = 1; > + /* { dg-note {forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis} {} { target *-*-* } .+1 } */ > +#pragma acc loop /* { dg-line l_loop_c[incr c_loop_c] } */ > + /* { dg-note {variable 'c' in 'private' clause is candidate for adjusting OpenACC privatization level} {} { target *-*-* } l_loop_c$c_loop_c } */ > + /* { dg-optimized {assigned OpenACC seq loop parallelism} {} { target *-*-* } l_loop_c$c_loop_c } */ > + for (c = 20; c > 0; --c) > + f1 *= c; > + > + /* { dg-note {beginning 'parloops' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 } */ > + if (c != 234) > + __builtin_abort (); > + /* { dg-optimized {assigned OpenACC seq loop parallelism} {} { target *-*-* } l_compute$c_compute } */ > + } > } > [...] > + assert (f1 == 2432902008176640000ULL); > > return 0; > } ----------------- 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 14dfbb53594e164fe222476523a68039a8bd5252 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 4 Mar 2022 20:34:40 +0100 Subject: [PATCH] Fix 'libgomp.oacc-c-c++-common/kernels-decompose-1.c' expected diagnostics Fix-up for recent commit 8935589b496f755e08cadf26d8ceddf0dd6e0968 "OMP lowering: Regimplify 'OMP_CLAUSE_MAP_DECL_MAKE_ADDRESSABLE' DECLs [PR100280, PR104132, PR104133]": adjust for a GCN offloading workaround added just before commit: '(volatile void *) &f1;'. PR testsuite/104791 libgomp/ * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Fix expected diagnostics. --- .../testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c index 049b3a44b03..985a547d381 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c @@ -37,6 +37,8 @@ int main() #pragma acc kernels /* { dg-line l_compute[incr c_compute] } */ /* { dg-note {variable 'g2\.0' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */ + /* { dg-note {variable 'f1\.1' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */ + /* { dg-note {variable 'f1\.2' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */ { /* { dg-note {beginning 'gang-single' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 } */ int c = 234; -- 2.25.1