]> git.ipfire.org Git - thirdparty/gcc.git/commit
openmp: Handle lastprivate on combined target correctly [PR99928]
authorJakub Jelinek <jakub@redhat.com>
Wed, 19 May 2021 07:21:09 +0000 (09:21 +0200)
committerJakub Jelinek <jakub@redhat.com>
Wed, 19 May 2021 07:30:03 +0000 (09:30 +0200)
commit780e5d4a2bac6eb7566c966a265961c99449cb55
tree510b86779d95345c176551b89007e22cb017b275
parentc6c62ba41d905db5c10f573d0e0faa84656f1731
openmp: Handle lastprivate on combined target correctly [PR99928]

This patch deals with 2 issues:
1) the gimplifier couldn't differentiate between
 #pragma omp parallel master
 #pragma omp taskloop simd
and
 #pragma omp parallel master taskloop simd
when there is a significant difference for clause handling between
the two; as master construct doesn't have any clauses, we don't currently
represent it during gimplification by an gimplification omp context at all,
so this patch makes sure we don't set OMP_PARALLEL_COMBINED on parallel master
when not combined further.  If we ever add a separate master context during
gimplification, we'd use ORT_COMBINED_MASTER vs. ORT_MASTER (or MASKED probably).
2) lastprivate when combined with target should be map(tofrom:) on the target,
this change handles it only when not combined with firstprivate though, that
will need further work (similarly to linear or reduction).

2021-05-19  Jakub Jelinek  <jakub@redhat.com>

PR middle-end/99928
gcc/
* tree.h (OMP_MASTER_COMBINED): Define.
* gimplify.c (gimplify_scan_omp_clauses): Rewrite lastprivate
handling for outer combined/composite constructs to a loop.
Handle lastprivate on combined target.
(gimplify_expr): Formatting fix.
gcc/c/
* c-parser.c (c_parser_omp_master): Set OMP_MASTER_COMBINED on
master when combined with taskloop.
(c_parser_omp_parallel): Don't set OMP_PARALLEL_COMBINED on
parallel master when not combined with taskloop.
gcc/cp/
* parser.c (cp_parser_omp_master): Set OMP_MASTER_COMBINED on
master when combined with taskloop.
(cp_parser_omp_parallel): Don't set OMP_PARALLEL_COMBINED on
parallel master when not combined with taskloop.
gcc/testsuite/
* c-c++-common/gomp/pr99928-2.c: Remove all xfails.
* c-c++-common/gomp/pr99928-12.c: New test.
gcc/c/c-parser.c
gcc/cp/parser.c
gcc/gimplify.c
gcc/testsuite/c-c++-common/gomp/pr99928-12.c [new file with mode: 0644]
gcc/testsuite/c-c++-common/gomp/pr99928-2.c
gcc/tree.h