From patchwork Fri Jan 31 14:55:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1231930 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=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-518647-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=C7tKA/9M; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 488KzW0DwSz9s1x for ; Sat, 1 Feb 2020 01:56:05 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=QNjyq8I1Z809bB6h6KQC09cnAbuG6VIJy+5MIwvpXrrfms5jc/ 42DlaXbjsIdYuIB73aujTAg0hPIiO8PXOqP/2mWi7y3d6YJTKv/WJpEaBlPFbEJt LTjrmEwzLv5gQGzXwZ9Q2JEtNPELZbkxoQAZTcnLzoGllQHYXElWJexF0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=Cyr3HM6CgETfLpl4UK1IUsix/Gc=; b=C7tKA/9MHqKkeG0kEmuu K471kM/63wGQR6klS2ePatJQNTY6sgqS3nnpQS5fk+7Zp/mrAOBD1Lc3818ivYGI cytWIZJWL1wFAb2f+I7vQvRqDWoxti+uIWLL/ig127VhrSHUlgzZROKeVTLPM4pe HbnDn0GEOQMOkts4KwUcj8E= Received: (qmail 21149 invoked by alias); 31 Jan 2020 14:55:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 21133 invoked by uid 89); 31 Jan 2020 14:55:54 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 31 Jan 2020 14:55:52 +0000 IronPort-SDR: qftu3CRLPGYriaagDPKgbgh0NgJV7AgagkCBGlRmOSUgFUG7k39gWObFkpvDbbAhgHjylMko9I lfmTn5z2bkn87JTnbnrUQYCnrTtG47/sq6CugPvIMm/BwMTVJkvIhZTq0+bIHJH6DNLC48oi5a TBH5FBspuZ8RyH2qLp/qnMB41kOd25tgnOZq0nXHCeRfVOJw6Xd7Gx80lvu2F/kuTqGJ1N8uzC mhBBIFRNj0aasV4N6Aujvak+NOnAvAZDK5Y7H75LyoeLSfHdUb3+VSz9DPRC7c/XFeirBPkUSf 97E= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 31 Jan 2020 06:55:38 -0800 IronPort-SDR: ubjmWUDtRFWvUv+07f5tXYmIypzcI60mYMjZ8bnksRSoL/XBlLZ4LEtdOzcZ/qnOm6pKA/KkJ/ L0EAy03jLhEg== To: gcc-patches , fortran From: Tobias Burnus Subject: [Patch, committed][Fortran] Disable front-end optimization for OpenACC atomic (PR93462) Message-ID: Date: Fri, 31 Jan 2020 15:55:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 X-IsSubscribed: yes The OpenACC code !$acc atomic write a = f(n) - f(n) got -ffrontend-optimize'd such that it ICEed in gfc_trans_omp_atomic. The same issue occurred for OpenMP in PR 92977 and was solved by disabling the optimization for EXEC_OMP_ATOMIC. This patch does now the same for OpenACC (EXEC_OACC_ATOMIC). Committed as obvious to the trunk. Tobias commit 6a97d9eae4543a995f895e6739530f55f5d039a7 Author: Tobias Burnus Date: Fri Jan 31 15:54:21 2020 +0100 [Fortran] Disable front-end optimization for OpenACC atomic (PR93462) PR fortran/93462 * frontend-passes.c (gfc_code_walker): For EXEC_OACC_ATOMIC, set in_omp_atomic to true prevent front-end optimization. PR fortran/93462 * gfortran.dg/goacc/atomic-1.f90: New. --- gcc/fortran/ChangeLog | 16 +++++++++++----- gcc/fortran/frontend-passes.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b8f70e6140f..9b17daf15f9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2020-01-31 Tobias Burnus + + PR fortran/93462 + * frontend-passes.c (gfc_code_walker): For EXEC_OACC_ATOMIC, set + in_omp_atomic to true prevent front-end optimization. + 2020-01-30 Bernhard Reutner-Fischer PR fortran/87103 @@ -25,11 +31,11 @@ 2020-01-28 Andrew Benson - PR fortran/93461 - * trans.h: Increase GFC_MAX_MANGLED_SYMBOL_LEN to - GFC_MAX_SYMBOL_LEN*3+5 to allow for inclusion of submodule name, - plus the "." between module and submodule names. - * gfortran.dg/pr93461.f90: New test. + PR fortran/93461 + * trans.h: Increase GFC_MAX_MANGLED_SYMBOL_LEN to + GFC_MAX_SYMBOL_LEN*3+5 to allow for inclusion of submodule name, + plus the "." between module and submodule names. + * gfortran.dg/pr93461.f90: New test. 2020-01-28 Andrew Benson diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index de11524ba14..bbe34d61c99 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -5258,6 +5258,7 @@ gfc_code_walker (gfc_code **c, walk_code_fn_t codefn, walk_expr_fn_t exprfn, WALK_SUBEXPR (co->ext.dt->extra_comma); break; + case EXEC_OACC_ATOMIC: case EXEC_OMP_ATOMIC: in_omp_atomic = true; break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b1dcf23855..f95d2d4e069 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-01-31 Tobias Burnus + + PR fortran/93462 + * gfortran.dg/goacc/atomic-1.f90: New. + 2020-01-31 Tamar Christina PR rtl-optimization/91838 diff --git a/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 b/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 new file mode 100644 index 00000000000..579f0494b78 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! +! PR fortran/93462 +! +! Contributed by G. Steinmetz +! +program p + integer :: n = 1 + integer :: a +!$acc atomic write + a = f(n) - f(n) +contains + integer function f(x) + integer, intent(in) :: x + f = x + end +end