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.
| 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)
--- /dev/null
+! { 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
--- /dev/null
+! { 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" } }
@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
--- /dev/null
+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