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 |
||
---|---|---|
.. | ||
appendix-a | ||
examples-4 | ||
aligned1.f03 | ||
alloc-comp-1.f90 | ||
alloc-comp-2.f90 | ||
alloc-comp-3.f90 | ||
allocatable1.f90 | ||
allocatable2.f90 | ||
allocatable3.f90 | ||
allocatable4.f90 | ||
allocatable5.f90 | ||
allocatable6.f90 | ||
allocatable7.f90 | ||
allocatable8.f90 | ||
allocatable9.f90 | ||
allocatable10.f90 | ||
allocatable11.f90 | ||
allocatable12.f90 | ||
associate1.f90 | ||
associate2.f90 | ||
cancel-do-1.f90 | ||
cancel-do-2.f90 | ||
cancel-parallel-1.f90 | ||
cancel-parallel-3.f90 | ||
cancel-sections-1.f90 | ||
cancel-taskgroup-2.f90 | ||
character1.f90 | ||
character2.f90 | ||
collapse1.f90 | ||
collapse2.f90 | ||
collapse3.f90 | ||
collapse4.f90 | ||
condinc1.f | ||
condinc1.inc | ||
condinc2.f | ||
condinc3.f90 | ||
condinc4.f90 | ||
crayptr1.f90 | ||
crayptr2.f90 | ||
crayptr3.f90 | ||
declare-simd-1.f90 | ||
declare-simd-2.f90 | ||
declare-simd-3.f90 | ||
declare-target-1.f90 | ||
declare-target-2.f90 | ||
depend-1.f90 | ||
depend-2.f90 | ||
depend-3.f90 | ||
do1.f90 | ||
do2.f90 | ||
fortran.exp | ||
jacobi.f | ||
lastprivate1.f90 | ||
lastprivate2.f90 | ||
lib1.f90 | ||
lib2.f | ||
lib3.f | ||
lib4.f90 | ||
lock-1.f90 | ||
lock-2.f90 | ||
nested1.f90 | ||
nestedfn1.f90 | ||
nestedfn2.f90 | ||
nestedfn3.f90 | ||
nestedfn4.f90 | ||
nestedfn5.f90 | ||
omp_atomic1.f90 | ||
omp_atomic2.f90 | ||
omp_atomic3.f90 | ||
omp_atomic4.f90 | ||
omp_atomic5.f90 | ||
omp_cond1.f | ||
omp_cond2.f | ||
omp_cond3.F90 | ||
omp_cond4.F90 | ||
omp_hello.f | ||
omp_orphan.f | ||
omp_parse1.f90 | ||
omp_parse2.f90 | ||
omp_parse3.f90 | ||
omp_parse4.f90 | ||
omp_reduction.f | ||
omp_workshare1.f | ||
omp_workshare2.f | ||
openmp_version-1.f | ||
openmp_version-2.f90 | ||
pointer1.f90 | ||
pointer2.f90 | ||
pr25162.f | ||
pr25219.f90 | ||
pr27395-1.f90 | ||
pr27395-2.f90 | ||
pr27416-1.f90 | ||
pr27916-1.f90 | ||
pr27916-2.f90 | ||
pr28390.f | ||
pr29629.f90 | ||
pr32359.f90 | ||
pr32550.f90 | ||
pr33880.f90 | ||
pr34020.f90 | ||
pr35130.f90 | ||
pr42162.f90 | ||
pr46753.f90 | ||
pr48894.f90 | ||
pr49792-1.f90 | ||
pr49792-2.f90 | ||
pr63938-1.f90 | ||
pr63938-2.f90 | ||
pr65597.f90 | ||
pr66199-1.f90 | ||
pr66199-2.f90 | ||
procptr1.f90 | ||
recursion1.f90 | ||
reduction1.f90 | ||
reduction2.f90 | ||
reduction3.f90 | ||
reduction4.f90 | ||
reduction5.f90 | ||
reduction6.f90 | ||
reference1.f90 | ||
reference2.f90 | ||
retval1.f90 | ||
retval2.f90 | ||
sharing1.f90 | ||
sharing2.f90 | ||
simd1.f90 | ||
simd2.f90 | ||
simd3.f90 | ||
simd4.f90 | ||
simd5.f90 | ||
simd6.f90 | ||
simd7.f90 | ||
stack.f90 | ||
strassen.f90 | ||
tabs1.f90 | ||
tabs2.f | ||
target1.f90 | ||
target2.f90 | ||
target3.f90 | ||
target4.f90 | ||
target5.f90 | ||
target6.f90 | ||
target7.f90 | ||
target8.f90 | ||
task1.f90 | ||
task2.f90 | ||
task3.f90 | ||
task4.f90 | ||
taskgroup1.f90 | ||
threadprivate1.f90 | ||
threadprivate2.f90 | ||
threadprivate3.f90 | ||
threadprivate4.f90 | ||
udr1.f90 | ||
udr2.f90 | ||
udr3.f90 | ||
udr4.f90 | ||
udr5.f90 | ||
udr6.f90 | ||
udr7.f90 | ||
udr8.f90 | ||
udr9.f90 | ||
udr10.f90 | ||
udr11.f90 | ||
udr12.f90 | ||
udr13.f90 | ||
udr14.f90 | ||
udr15.f90 | ||
use_intrinsic_1.f90 | ||
vla1.f90 | ||
vla2.f90 | ||
vla3.f90 | ||
vla4.f90 | ||
vla5.f90 | ||
vla6.f90 | ||
vla7.f90 | ||
vla8.f90 | ||
workshare1.f90 | ||
workshare2.f90 |