41b37d5ec1
PR middle-end/66199 * tree.h (OMP_TEAMS_COMBINED): Define. * gimplify.c (enum gimplify_omp_var_data): Add GOVD_LINEAR_LASTPRIVATE_NO_OUTER. (enum omp_region_type): Add ORT_COMBINED_TEAMS. (omp_notice_variable): Accept both ORT_TEAMS and ORT_COMBINED_TEAMS. Don't recurse if GOVD_LINEAR_LASTPRIVATE_NO_OUTER is set and either GOVD_LINEAR is set, or GOVD_LASTPRIVATE without GOVD_FIRSTPRIVATE. (omp_no_lastprivate): New function. (gimplify_scan_omp_clauses): For OMP_CLAUSE_LASTPRIVATE and OMP_CLAUSE_LINEAR, if omp_no_lastprivate, don't notice_outer and set appropriate bits, otherwise make sure default(none) combined constructs won't complain. (gimplify_adjust_omp_clauses): Remove OMP_CLAUSE_LINEAR outer special casing, for OMP_CLAUSE_LASTPRIVATE if omp_no_lastprivate either remove the clause or turn it into OMP_CLAUSE_PRIVATE. (gimplify_omp_for): Fix up handling of implicit lastprivate or linear iterators. (gimplify_omp_workshare): For OMP_TEAMS_COMBINED use ORT_COMBINED_TEAMS. * omp-low.c (lower_omp_for_lastprivate): For combined for simd use fd.loop.n2 from the for rather than simd. gcc/c/ * c-parser.c (c_parser_omp_for_loop): Don't add OMP_CLAUSE_SHARED to OMP_PARALLEL_CLAUSES when moving OMP_CLAUSE_LASTPRIVATE clause to OMP_FOR_CLAUSES. (c_parser_omp_teams): Set OMP_TEAMS_COMBINED for combined constructs. gcc/cp/ * parser.c (cp_parser_omp_for_loop): Don't add OMP_CLAUSE_SHARED to OMP_PARALLEL_CLAUSES when moving OMP_CLAUSE_LASTPRIVATE clause to OMP_FOR_CLAUSES. (cp_parser_omp_teams): Set OMP_TEAMS_COMBINED for combined constructs. gcc/fortran/ * trans-openmp.c (gfc_trans_omp_teams): Set OMP_TEAMS_COMBINED for combined constructs. (gfc_trans_omp_target): Make sure BIND_EXPR has non-NULL BIND_EXPR_BLOCK. libgomp/ * testsuite/libgomp.c/pr66199-1.c: New test. * testsuite/libgomp.c/pr66199-2.c: New test. * testsuite/libgomp.c++/pr66199-1.C: New test. * testsuite/libgomp.c++/pr66199-2.C: New test. * testsuite/libgomp.fortran/pr66199-1.f90: New test. * testsuite/libgomp.fortran/pr66199-2.f90: New test. From-SVN: r223387
48 lines
1.2 KiB
Fortran
48 lines
1.2 KiB
Fortran
! PR middle-end/66199
|
|
! { dg-do run }
|
|
! { dg-options "-O2 -fopenmp" }
|
|
|
|
integer :: u(1024), v(1024), w(1024), a, b, c, d, e, a1, b1, a2, b2, d1, d2
|
|
a = 1
|
|
b = 1024
|
|
d = 75
|
|
!$omp target teams distribute parallel do simd default(none) &
|
|
!$omp& firstprivate (a, b) shared(u, v, w)
|
|
do d = a, b
|
|
u(d) = v(d) + w(d)
|
|
end do
|
|
c = 17
|
|
d = 75
|
|
!$omp target teams distribute parallel do simd default(none) &
|
|
!$omp& firstprivate (a, b) shared(u, v, w) &
|
|
!$omp& linear(d) linear(c:5) lastprivate(e)
|
|
do d = a, b
|
|
u(d) = v(d) + w(d)
|
|
c = c + 5
|
|
e = c
|
|
end do
|
|
a1 = 0
|
|
a2 = 0
|
|
b1 = 31
|
|
b2 = 31
|
|
d1 = 7
|
|
d2 = 9
|
|
!$omp target teams distribute parallel do simd default(none) &
|
|
!$omp& firstprivate (a1, b1, a2, b2) &
|
|
!$omp& shared(u, v, w) lastprivate(d1, d2) collapse(2)
|
|
do d1 = a1, b1
|
|
do d2 = a2, b2
|
|
u(d1 * 32 + d2 + 1) = v(d1 * 32 + d2 + 1) + w(d1 * 32 + d2 + 1)
|
|
end do
|
|
end do
|
|
d1 = 7
|
|
d2 = 9
|
|
!$omp target teams distribute parallel do simd default(none) &
|
|
!$omp& firstprivate (a1, b1, a2, b2) shared(u, v, w) collapse(2)
|
|
do d1 = a1, b1
|
|
do d2 = a2, b2
|
|
u(d1 * 32 + d2 + 1) = v(d1 * 32 + d2 + 1) + w(d1 * 32 + d2 + 1)
|
|
end do
|
|
end do
|
|
end
|