From patchwork Tue Dec 14 06:23:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1567583 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JCpHQ18FNz9s1l for ; Tue, 14 Dec 2021 17:24:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9E9CC385803A for ; Tue, 14 Dec 2021 06:23:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id D7F023858D39; Tue, 14 Dec 2021 06:23:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D7F023858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: EDDH3SI7qBdunN9WulHEXp0QkpQMIIt8z2Mgn6sewftJ+uG0DTw41IEscTr/zVCAhd0J7eKStk xINIl2Mw638d7d6TGM/sGFQeEAweKLv1ToaVZrMGImh6cX/AV8QOouopvGWrUTJFOmpAtTB+me /aUcjrfXrvhccjPOr/jBiWtFpwJ9sEC4u1Qj1AlPOdiIKVzV3LHe4XLmAGH7nScj91vn2dxFuK J3Qh0kz3tI/NbwY9oMxgA0hYSR3Ii8/4xj5NA6m0L9zbfZWF6bawN6oyn/K3b27gNCa5zoL3nf ACWAflwL7NDURUkqyuAsrz2x X-IronPort-AV: E=Sophos;i="5.88,204,1635235200"; d="scan'208,223";a="69663064" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 13 Dec 2021 22:23:22 -0800 IronPort-SDR: PWvGXehbvL0XCGtp80zT8y3RhQ0xnN4hJ7GlRMEGb4sVpai5hcbcM9kRO5PRqF6DKjq45zx2ak 1S3tqAUfrKLfwClEACF06gPJSY7FtURmIxt9AzL0TXs3+7XUX1mPhI/gr8GhxJk1SALNoBZGIS tpIk8o9PRBvoCzjfzc5B+An93x4PTXYbVNuFWfkpBIwKIIRkea4S9MDoV/E29pcWwWYPM2kFzY PX0sjSShNqBpw/4G5P2uysLXwRPXvMHpJdNT1pPj+479qSCjabN056MVtEQo4FMg3L+qqrRu8X iMU= From: Thomas Schwinge To: Tobias Burnus , Subject: Adjust 'gfortran.dg/goacc/privatization-1-*' [PR103576, PR103697] (was: [Patch] Fortran: Handle compare in OpenMP atomic) In-Reply-To: <90154e1c-21fc-c0aa-82f4-cbd3e81f826a@codesourcery.com> References: <90154e1c-21fc-c0aa-82f4-cbd3e81f826a@codesourcery.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Tue, 14 Dec 2021 07:23:09 +0100 Message-ID: <87v8zrg0xe.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.1 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.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 Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi Tobias! On 2021-12-13T12:19:50+0100, Tobias Burnus wrote: > Implement the 'compare' part in trans-openmp of OpenMP 5.1's atomic changes > plus a couple of bugfixes throughout. Hmm, I wonder why you didn't see the few regressions in your testing? Pushed to master branch commit 228d64af4e244faabab5c47506920a1bde85d74e "Adjust 'gfortran.dg/goacc/privatization-1-*' [PR103576, PR103697]", 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 228d64af4e244faabab5c47506920a1bde85d74e Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 14 Dec 2021 07:03:52 +0100 Subject: [PATCH] Adjust 'gfortran.dg/goacc/privatization-1-*' [PR103576, PR103697] ... for the recent commit 494ebfa7c9aacaeb6ec1fccc47a0e49f31eb2bb8 "Fortran: Handle compare in OpenMP atomic", which changes the GIMPLE IR such that a temporary is no longer used; 'original' dump: x = *a; - { - integer(kind=4) D.4237; - - D.4237 = *a; #pragma omp atomic relaxed - &y = D.4237; - } + &y = *a; } (I'm not familiar to comment whether that's correct; but it appears that the difference again disappears in later compiler passes.) These OpenACC test cases verify behavior re OpenACC privatization levels, and have to be adjusted accordingly. gcc/testsuite/ PR fortran/103576 PR testsuite/103697 * gfortran.dg/goacc/privatization-1-compute-loop.f90: Adjust. * gfortran.dg/goacc/privatization-1-compute.f90: Likewise. * gfortran.dg/goacc/privatization-1-routine_gang-loop.f90: Likewise. * gfortran.dg/goacc/privatization-1-routine_gang.f90: Likewise. --- gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 | 1 - gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 | 1 - .../gfortran.dg/goacc/privatization-1-routine_gang-loop.f90 | 1 - gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang.f90 | 1 - 4 files changed, 4 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 index bcd7159ae5b..47ba5baf439 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute-loop.f90 @@ -50,7 +50,6 @@ contains ! { dg-note {variable 'x' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'y' in 'private' clause is candidate for adjusting OpenACC privatization level} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } l_loop$c_loop } - ! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'y' ought to be adjusted for OpenACC privatization level: 'vector'} "" { target *-*-* } l_loop$c_loop } !$acc end parallel end subroutine f diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 index 31f998dfc92..4813e44a233 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-compute.f90 @@ -43,6 +43,5 @@ contains ! { dg-note {variable 'j' in 'private' clause potentially has improper OpenACC privatization level: 'parm_decl'} "TODO3" { xfail *-*-* } l_compute$c_compute } ! { dg-note {variable 'a' in 'private' clause potentially has improper OpenACC privatization level: 'parm_decl'} "TODO4" { xfail *-*-* } l_compute$c_compute } ! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } l_compute$c_compute } - ! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_compute$c_compute } end subroutine f end module m diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang-loop.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang-loop.f90 index db6d8226ed0..36f2a886e47 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang-loop.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang-loop.f90 @@ -50,7 +50,6 @@ contains ! { dg-note {variable 'x' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'y' in 'private' clause is candidate for adjusting OpenACC privatization level} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } l_loop$c_loop } - ! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } l_loop$c_loop } ! { dg-note {variable 'y' ought to be adjusted for OpenACC privatization level: 'vector'} "" { target *-*-* } l_loop$c_loop } end subroutine f end module m diff --git a/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang.f90 b/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang.f90 index 725bd5e2ebe..0615a445e44 100644 --- a/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/privatization-1-routine_gang.f90 @@ -43,5 +43,4 @@ contains ! { dg-note {variable 'j' in 'private' clause potentially has improper OpenACC privatization level: 'parm_decl'} "TODO" { xfail *-*-* } l_routine$c_routine } ! { dg-note {variable 'a' in 'private' clause potentially has improper OpenACC privatization level: 'parm_decl'} "TODO" { xfail *-*-* } l_routine$c_routine } ! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { xfail *-*-* } l_routine$c_routine } - ! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "TODO" { xfail *-*-* } l_routine$c_routine } end module m -- 2.33.0