From: Sandra Loosemore <sandra@codesourcery.com>
To: "fortran@gcc.gnu.org" <fortran@gcc.gnu.org>
Cc: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Fortran: Fix clause splitting for OMP masked taskloop directive
Date: Fri, 25 Mar 2022 20:02:04 -0600 [thread overview]
Message-ID: <5061c0a0-563d-b18e-dc5e-36142ae185ec@codesourcery.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
I ran into this bug in the handling of clauses on the combined "masked
taskloop" OMP directive when I was working on something else. The fix
turned out to be a 1-liner. OK for trunk?
-Sandra
[-- Attachment #2: masked-taskloop-bugfix.patch --]
[-- Type: text/x-patch, Size: 1821 bytes --]
commit 17c4fa0bd97c070945004095a06fb7d9e91869e3
Author: Sandra Loosemore <sandra@codesourcery.com>
Date: Wed Mar 23 18:45:25 2022 -0700
Fortran: Fix clause splitting for OMP masked taskloop directive
This patch fixes an obvious coding goof that caused all clauses for
the combined OMP masked taskloop directive to be discarded.
gcc/fortran/
* trans-openmp.cc (gfc_split_omp_clauses): Fix mask for
EXEC_OMP_MASKED_TASKLOOP.
gcc/testsuite/
* gfortran.dg/gomp/masked-taskloop.f90: New.
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index 101924f..25dde82 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -5998,7 +5998,7 @@ gfc_split_omp_clauses (gfc_code *code,
innermost = GFC_OMP_SPLIT_DO;
break;
case EXEC_OMP_MASKED_TASKLOOP:
- mask = GFC_OMP_SPLIT_MASKED | GFC_OMP_SPLIT_TASKLOOP;
+ mask = GFC_OMP_MASK_MASKED | GFC_OMP_MASK_TASKLOOP;
innermost = GFC_OMP_SPLIT_TASKLOOP;
break;
case EXEC_OMP_MASTER_TASKLOOP:
diff --git a/gcc/testsuite/gfortran.dg/gomp/masked-taskloop.f90 b/gcc/testsuite/gfortran.dg/gomp/masked-taskloop.f90
new file mode 100644
index 0000000..6fb7111
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/masked-taskloop.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! { dg-additional-options "-fopenmp -fdump-tree-original" }
+
+! There was a bug in the clause splitting for the "masked taskloop"
+! combined directive that caused it to lose all the clauses.
+
+subroutine s1 (a1, a2)
+ integer :: a1, a2
+ integer :: i, j
+
+ !$omp masked taskloop collapse(2) grainsize(4)
+ do i = 1, a1
+ do j = 1, a2
+ end do
+ end do
+
+end subroutine
+
+! { dg-final { scan-tree-dump "omp taskloop collapse\\(2\\) grainsize\\(4\\)" "original" } }
next reply other threads:[~2022-03-26 2:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 2:02 Sandra Loosemore [this message]
2022-03-26 7:03 ` Jakub Jelinek
2022-04-05 4:05 ` PING " Sandra Loosemore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5061c0a0-563d-b18e-dc5e-36142ae185ec@codesourcery.com \
--to=sandra@codesourcery.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).