Hi!
On Thu, 28 Feb 2019 21:37:21 +0100, I wrote:
> On Mon, 15 Aug 2016 18:54:49 -0700, Cesar Philippidis
> <ce...@codesourcery.com> wrote:
> > [...]
> >
> > Note that besides for checking for multiple acc routine directives, this
> > patch also handles the case where the optional name argument in 'acc
> > routine (NAME)' is the name of the current procedure. This was a TODO
> > item in gomp4.
>
> > --- a/gcc/fortran/openmp.c
> > +++ b/gcc/fortran/openmp.c
>
> > @@ -1969,6 +1971,13 @@ gfc_match_oacc_routine (void)
> > gfc_current_locus = old_loc;
> > return MATCH_ERROR;
> > }
> > +
> > + /* Set sym to NULL if it matches the current procedure's
> > + name. This will simplify the check for duplicate ACC
> > + ROUTINE attributes. */
> > + if (gfc_current_ns->proc_name
> > + && !strcmp (buffer, gfc_current_ns->proc_name->name))
> > + sym = NULL;
> > }
> > else
> > {
>
> I re-worked the code a bit, didn't find this necessary.Specifically, a very similar check has already been present, comparing to 'sym->name' instead of 'buffer'. (Not sure, if one is to be preferred over the other, when/if they would ever be different. It feels like instead of these strings, we should be comparing some kind of symbolic "resolved" handle, "sym". And, as it should turn out, I have a cleanup patch for next GCC development stage 1 to clean up that and other stuff in 'gfc_match_oacc_routine'.) Anyway, to clarify, I committed to trunk r269856 "[PR72741] The name in a Fortran OpenACC 'routine' directive refers to the containing subroutine or function", see attached. Grüße Thomas
From 467b1bdb6c33711416a3ca270ac51b2b99f2f85b Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 21 Mar 2019 19:54:51 +0000
Subject: [PATCH] [PR72741] The name in a Fortran OpenACC 'routine' directive
refers to the containing subroutine or function
gcc/fortran/
PR fortran/72741
* openmp.c (gfc_match_oacc_routine): Clarify.
gcc/testsuite/
PR fortran/72741
* gfortran.dg/goacc/routine-module-mod-1.f90: Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269856 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/fortran/ChangeLog | 3 +++
gcc/fortran/openmp.c | 3 +++
gcc/testsuite/ChangeLog | 3 +++
gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 | 4 ++--
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2afab3920bda..111e3a266e9b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,8 @@
2019-03-21 Thomas Schwinge <tho...@codesourcery.com>
+ PR fortran/72741
+ * openmp.c (gfc_match_oacc_routine): Clarify.
+
PR fortran/72741
* module.c (verify_OACC_ROUTINE_LOP_NONE): New function.
(enum ab_attribute): Add AB_OACC_ROUTINE_LOP_GANG,
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 7a06eb58f5cf..1b1a0b4108fd 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -2314,6 +2314,9 @@ gfc_match_oacc_routine (void)
if (st)
{
sym = st->n.sym;
+ /* If the name in a 'routine' directive refers to the containing
+ subroutine or function, then make sure that we'll later handle
+ this accordingly. */
if (gfc_current_ns->proc_name != NULL
&& strcmp (sym->name, gfc_current_ns->proc_name->name) == 0)
sym = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8afdf3e980e9..0c94f6bcacf8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2019-03-21 Thomas Schwinge <tho...@codesourcery.com>
+ PR fortran/72741
+ * gfortran.dg/goacc/routine-module-mod-1.f90: Update.
+
PR fortran/72741
* gfortran.dg/goacc/routine-module-1.f90: New file.
* gfortran.dg/goacc/routine-module-2.f90: Likewise.
diff --git a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
index 3855b8c88596..23c673fe3bd1 100644
--- a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
@@ -18,7 +18,7 @@ contains
subroutine s_2
implicit none
- !$acc routine seq
+ !$acc routine (s_2) seq
integer :: i
@@ -41,7 +41,7 @@ contains
subroutine w_1
implicit none
- !$acc routine worker
+ !$acc routine (w_1) worker
integer :: i
--
2.17.1
signature.asc
Description: PGP signature
