From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39496 invoked by alias); 14 Jul 2015 21:24:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 39472 invoked by uid 89); 14 Jul 2015 21:24:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients 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 ESMTP; Tue, 14 Jul 2015 21:23:59 +0000 Received: from svr-orw-fem-06.mgc.mentorg.com ([147.34.97.120]) by relay1.mentorg.com with esmtp id 1ZF7gA-0000xb-Oz from Cesar_Philippidis@mentor.com ; Tue, 14 Jul 2015 14:23:54 -0700 Received: from [127.0.0.1] (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; Tue, 14 Jul 2015 14:23:54 -0700 Message-ID: <55A57DE9.1020205@codesourcery.com> Date: Tue, 14 Jul 2015 21:26:00 -0000 From: Cesar Philippidis User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Ilmir Usmanov , Ilmir Usmanov CC: "gcc-patches@gcc.gnu.org" , "fortran@gcc.gnu.org" Subject: Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives References: <3008431435623821@web14j.yandex.ru> <5591E54E.90509@ilmir.us> <650751436268444@web22m.yandex.ru> <55A57D1C.60304@samsung.com> In-Reply-To: <55A57D1C.60304@samsung.com> Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 7bit X-SW-Source: 2015-07/txt/msg01207.txt.bz2 On 07/14/2015 02:20 PM, Ilmir Usmanov wrote: > Ping Sorry, I thought I had already approved this. It's fine for gomp-4_0-branch. Cesar > On 07.07.2015 14:27, Ilmir Usmanov wrote: >> Ping >> >> 30.06.2015, 03:43, "Ilmir Usmanov" : >>> Hi Cesar! >>> >>> Thanks for your review! >>> >>> 08.06.2015, 17:59, "Cesar Philippidis" : >>>> On 06/07/2015 02:05 PM, Ilmir Usmanov wrote: >>>>> Fixed fortran mail-list address. Sorry for inconvenience. >>>>> >>>>> 08.06.2015, 00:01, "Ilmir Usmanov" : >>>>>>> Hi Cesar! >>>>>>> >>>>>>> This patch fixes checks of OpenMP and OpenACC continuations in >>>>>>> case if someone mixes them (i.e. continues OpenMP directive with >>>>>>> !$ACC sentinel or vice versa). >>>>>>> >>>>>>> OK for gomp branch? >>>> Thanks for working on this. Does this fix PR63858 by any chance? >>> No problem. I had a feeling that something is wrong in the scanner since >>> I've committed an initial support of OpenACC ver. 1.0 to gomp branch >>> (more than a year ago). >>> Now it does fix the PR, because I've added support of fixed form to the >>> patch. BTW, your test in the PR has a wrong continuation. Fixed test >>> added to the patch. >>> >>>> two minor nits... >>>> >>>>> 0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch >>>>> >>>>> From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17 >>>>> 00:00:00 2001 >>>>> From: Ilmir Usmanov >>>>> Date: Sun, 7 Jun 2015 23:55:22 +0300 >>>>> Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in >>>>> continuation >>>>> >>>>> --- >>>>> gcc/fortran/ChangeLog | 5 +++++ >>>> Use ChangeLog.gomp for gomp-4_0-branch. >>> Done. >>> >>>>> + /* In case we have an OpenMP directive continued by OpenACC >>>>> + sentinel, or vice versa, we get both openmp_flag and >>>>> + openacc_flag on. */ >>>>> + >>>>> + if (openacc_flag && openmp_flag) >>>>> + { >>>>> + int is_openmp = 0; >>>>> + for (i = 0; i < 5; i++, c = next_char ()) >>>>> + { >>>>> + if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i]) >>>>> + is_openmp = 1; >>>>> + if (i == 4) >>>>> + old_loc = gfc_current_locus; >>>>> + } >>>>> + gfc_error ("Wrong %s continuation at %C: expected %s, got %s", >>>>> + is_openmp ? "OpenACC" : "OpenMP", >>>>> + is_openmp ? "!$ACC" : "!$OMP", >>>>> + is_openmp ? "!$OMP" : "!$ACC"); >>>> I think it's better for the translation project if you made this a >>>> complete string. So maybe change this line into >>>> >>>> gfc_error (is_openmp ? "Wrong continuation at %C: expected >>>> !$ACC, got" >>>> " !$OMP", >>>> : "Wrong continuation at %C: expected !$OMP, got >>>> !$ACC"); >>> Done >>> >>>> Other than that, it looks fine. >>>> >>>> Thanks, >>>> Cesar >>> OK for gomp branch? >>> >>> -- >>> Ilmir. >> -- >> Ilmir. >>