From patchwork Wed Jul 13 13:33:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 647922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3rqKYr2wNGz9s9W for ; Wed, 13 Jul 2016 23:34:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=QGAh60LA; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=siXZjv2iuozxkoaDqDnI2aFCtjPFJ KmXQjuLglVkuXdTp0QU4c435svYMRTFgHLitFuNfwu9xEyS/jJrXcaF6Om6JEVno zvxITvce/ZexGQfMZPoQlnTYpYq1G3LyDQTz2XBz3FodnsVAcrmNDllHRTr2SJss /VCkuTgPa7oVfw= 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=kz+aH29EyG0idOLZoQo2cpozQsA=; b=QGA h60LAJYy1QxY7Bj4o9ZVZnihQ+MKzsE/GIQt7dbBUeV5CpyYeIbCnu7Rdzf3l3Yv a9C8S/kLjLJdufPsJtG9jCEe1bxbvRLG/M/HRbfFTWU0jLBNEr8lQsNoUW02mMo1 eHkjNoSsrgfYLq9lIG51rcJRkQ0jY9FEpQJsCdYY= Received: (qmail 5803 invoked by alias); 13 Jul 2016 13:34:16 -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 5788 invoked by uid 89); 13 Jul 2016 13:34:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=tschwinge, 2016-07-01, 20160701, H*r:PDT X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 13 Jul 2016 13:34:05 +0000 Received: from svr-orw-fem-06.mgc.mentorg.com ([147.34.97.120]) by relay1.mentorg.com with esmtp id 1bNKId-0002Sz-CY from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 13 Jul 2016 06:34:03 -0700 Received: from tftp-cs (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.3.224.2; Wed, 13 Jul 2016 06:34:03 -0700 Received: by tftp-cs (Postfix, from userid 49978) id A5D8BC2320; Wed, 13 Jul 2016 06:34:02 -0700 (PDT) From: Thomas Schwinge To: Cesar Philippidis , "gcc-patches@gcc.gnu.org" Subject: Re: [gomp4] backport fixes for PR71704 In-Reply-To: <57854D1F.3080000@codesourcery.com> References: <20160630174728.GQ7387@tucnak.redhat.com> <57854D1F.3080000@codesourcery.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Wed, 13 Jul 2016 15:33:47 +0200 Message-ID: <87lh15ek78.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Tue, 12 Jul 2016 13:03:43 -0700, Cesar Philippidis wrote: > This patch contains both Jakub's OpenMP and my OpenACC fixes for > PR71704. For reference, the discussion for the original patches can be > found here . > > I'll apply this patch to gomp-4_0-branch shortly. > 2016-07-12 Cesar Philippidis > > Backport from trunk: > 2016-07-08 Cesar Philippidis > [...] > 2016-06-01 Jakub Jelinek > > gcc/fortran/ > * parse.c (case_decl): Move ST_OMP_* to ... > (case_omp_decl): ... here, new macro. > (verify_st_order): For case_omp_decl, complain about > p->state >= ORDER_EXEC, but don't change p->state otherwise. > > gcc/testsuite > * gfortran.dg/gomp/order-1.f90: New test. > * gfortran.dg/gomp/order-2.f90: New test. ;-) Incorrect ChangeLog updates; fixed in gomp-4_0-branch r238296: commit fbdd5b5332e59166c990e10e41649756e9d3a897 Author: tschwinge Date: Wed Jul 13 13:28:46 2016 +0000 Fix r238262 ChangeLog updates git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@238296 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog.gomp | 17 ++++++++++++----- gcc/testsuite/ChangeLog.gomp | 5 ++--- 2 files changed, 14 insertions(+), 8 deletions(-) Grüße Thomas diff --git gcc/fortran/ChangeLog.gomp gcc/fortran/ChangeLog.gomp index 4c51452..2532abc 100644 --- gcc/fortran/ChangeLog.gomp +++ gcc/fortran/ChangeLog.gomp @@ -9,12 +9,19 @@ ST_GET_FCN_CHARACTERISTICS if a non-declarative directive could be matched. - 2016-06-01 Jakub Jelinek + 2016-06-30 Jakub Jelinek - * parse.c (case_decl): Move ST_OMP_* to ... - (case_omp_decl): ... here, new macro. - (verify_st_order): For case_omp_decl, complain about - p->state >= ORDER_EXEC, but don't change p->state otherwise. + * parse.c (matchs, matcho): Move right before decode_omp_directive. + If spec_only, only gfc_match the keyword and if successful, goto + do_spec_only. + (matchds, matchdo): Define. + (decode_omp_directive): Add spec_only local var and set it. + Use matchds or matchdo macros instead of matchs or matcho + for declare target, declare simd, declare reduction and threadprivate + directives. Return ST_GET_FCN_CHARACTERISTICS if a non-declarative + directive could be matched. + (next_statement): For ST_GET_FCN_CHARACTERISTICS restore + gfc_current_locus from old_locus even if there is no label. 2016-07-01 Cesar Philippidis diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index d731dc6..d31ff07 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -5,10 +5,9 @@ * gfortran.dg/goacc/pr71704.f90: New test. - 2016-06-01 Jakub Jelinek + 2016-06-30 Jakub Jelinek - * gfortran.dg/gomp/order-1.f90: New test. - * gfortran.dg/gomp/order-2.f90: New test. + * gfortran.dg/gomp/pr71704.f90: New test. 2016-06-10 Thomas Schwinge