From: Tobias Burnus <tobias@codesourcery.com>
To: gcc-patches <gcc-patches@gcc.gnu.org>,
fortran <fortran@gcc.gnu.org>, Jakub Jelinek <jakub@redhat.com>
Subject: [Patch] OpenMP/Fortran: Add support for firstprivate and allocate clauses on scope construct
Date: Fri, 3 Jun 2022 15:37:56 +0200 [thread overview]
Message-ID: <e89f8b03-3ee1-8c3a-173e-1e662133ff43@codesourcery.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Simple patch. Testcases based on the C/C++ commit.
For allocate, I found an unrelated bug which prevented me from adding
the associated testcase: https://gcc.gnu.org/PR105836
Tested on x86-64 (w/o offloading).
OK for mainline?
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Attachment #2: omp-scope-fortran2.diff --]
[-- Type: text/x-patch, Size: 4979 bytes --]
OpenMP/Fortran: Add support for firstprivate and allocate clauses on scope construct
Fortran commit to C/C++/backend commit
r13-862-gf38b20d68fade5a922b9f68c4c3841e653d1b83c
gcc/fortran/ChangeLog:
* openmp.cc (OMP_SCOPE_CLAUSES): Add firstprivate and allocate.
libgomp/ChangeLog:
* libgomp.texi (OpenMP 5.2): Mark scope w/ firstprivate/allocate as Y.
* testsuite/libgomp.fortran/scope-2.f90: New test.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/scope-5.f90: New test.
* gfortran.dg/gomp/scope-6.f90: New test.
gcc/fortran/openmp.cc | 3 +-
gcc/testsuite/gfortran.dg/gomp/scope-5.f90 | 9 +++++
gcc/testsuite/gfortran.dg/gomp/scope-6.f90 | 23 +++++++++++
libgomp/libgomp.texi | 2 +-
libgomp/testsuite/libgomp.fortran/scope-2.f90 | 57 +++++++++++++++++++++++++++
5 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index a1aa88c5d74..d12cec43d64 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -3682,7 +3682,8 @@ cleanup:
| OMP_CLAUSE_PRIVATE | OMP_CLAUSE_LASTPRIVATE | OMP_CLAUSE_REDUCTION)
#define OMP_SCOPE_CLAUSES \
- (omp_mask (OMP_CLAUSE_PRIVATE) | OMP_CLAUSE_REDUCTION)
+ (omp_mask (OMP_CLAUSE_PRIVATE) |OMP_CLAUSE_FIRSTPRIVATE \
+ | OMP_CLAUSE_REDUCTION | OMP_CLAUSE_ALLOCATE)
#define OMP_SECTIONS_CLAUSES \
(omp_mask (OMP_CLAUSE_PRIVATE) | OMP_CLAUSE_FIRSTPRIVATE \
| OMP_CLAUSE_LASTPRIVATE | OMP_CLAUSE_REDUCTION | OMP_CLAUSE_ALLOCATE)
diff --git a/gcc/testsuite/gfortran.dg/gomp/scope-5.f90 b/gcc/testsuite/gfortran.dg/gomp/scope-5.f90
new file mode 100644
index 00000000000..baddae51b42
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/scope-5.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+
+subroutine foo ()
+ integer f
+ f = 0;
+ !$omp scope firstprivate(f) ! { dg-error "firstprivate variable 'f' is private in outer context" }
+ f = f + 1
+ !$omp end scope
+end
diff --git a/gcc/testsuite/gfortran.dg/gomp/scope-6.f90 b/gcc/testsuite/gfortran.dg/gomp/scope-6.f90
new file mode 100644
index 00000000000..9c595b1e117
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/scope-6.f90
@@ -0,0 +1,23 @@
+! { dg-additional-options "-fdump-tree-original" }
+
+module m
+ use iso_c_binding
+ !use omp_lib, only: omp_allocator_handle_kind
+ implicit none
+ integer, parameter :: omp_allocator_handle_kind = c_intptr_t
+ integer :: a = 0, b = 42, c = 0
+
+contains
+ subroutine foo (h)
+ integer(omp_allocator_handle_kind), value :: h
+ !$omp scope private (a) firstprivate (b) reduction (+: c) allocate ( h : a , b , c)
+ if (b /= 42) &
+ error stop
+ a = 36
+ b = 15
+ c = c + 1
+ !$omp end scope
+ end
+end
+
+! { dg-final { scan-tree-dump "omp scope private\\(a\\) firstprivate\\(b\\) reduction\\(\\+:c\\) allocate\\(allocator\\(D\\.\[0-9\]+\\):a) allocate\\(allocator\\(D\\.\[0-9\]+\\):b) allocate\\(allocator\\(D\\.\[0-9\]+\\):c)" "original" } }
diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index ff02ccd4969..11613bf7599 100644
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -386,7 +386,7 @@ The OpenMP 4.5 specification is fully supported.
@item Deprecation of delimited form of @code{declare target} @tab N @tab
@item Reproducible semantics changed for @code{order(concurrent)} @tab N @tab
@item @code{allocate} and @code{firstprivate} clauses on @code{scope}
- @tab N @tab
+ @tab Y @tab
@item @code{ompt_callback_work} @tab N @tab
@item Default map-type for @code{map} clause in @code{target enter/exit data}
@tab N @tab
diff --git a/libgomp/testsuite/libgomp.fortran/scope-2.f90 b/libgomp/testsuite/libgomp.fortran/scope-2.f90
new file mode 100644
index 00000000000..f2e1593403e
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/scope-2.f90
@@ -0,0 +1,57 @@
+program main
+ implicit none
+ integer a(0:63)
+ integer r, r2, i, n
+ a = 0
+ r = 0
+ r2 = 0
+ n = 64
+ !$omp parallel
+ !$omp scope
+ !$omp scope firstprivate (n)
+ !$omp do
+ do i = 0, 63
+ a(i) = a(i) + 1
+ end do
+ !$omp end scope nowait
+ !$omp end scope nowait
+
+ !$omp scope reduction(+: r) firstprivate (n)
+ !$omp do
+ do i = 0, 63
+ r = r + i
+ if (a(i) /= 1) &
+ error stop
+ end do
+ !$omp end do nowait
+ !$omp barrier
+ if (n /= 64) then
+ error stop
+ else
+ n = 128
+ end if
+ !$omp end scope nowait
+
+ !$omp barrier
+ if (r /= 64 * 63 / 2) &
+ error stop
+ !$omp scope private (i)
+ !$omp scope reduction(+: r2)
+ !$omp do
+ do i = 0, 63
+ r2 = r2 + 2 * i
+ a(i) = a(i) + i
+ end do
+ !$omp end do nowait
+ !$omp end scope
+ !$omp end scope nowait
+ if (r2 /= 64 * 63) &
+ error stop
+ !$omp do
+ do i = 0, 63
+ if (a(i) /= i + 1) &
+ error stop
+ end do
+ !$omp end do nowait
+ !$omp end parallel
+end program
next reply other threads:[~2022-06-03 13:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 13:37 Tobias Burnus [this message]
2022-06-03 13:41 ` Jakub Jelinek
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=e89f8b03-3ee1-8c3a-173e-1e662133ff43@codesourcery.com \
--to=tobias@codesourcery.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
/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).