diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-12-08 10:45:30 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-12-08 10:45:30 +0100 |
| commit | 31007091b10944c358e5038a6271d7e2744cde37 (patch) | |
| tree | beb5b083c035dd644ad764ab68d9ab8f6c240a4c /gcc/cp | |
| parent | c2c198bfd1e747b761c6b9b13417685bd4378d57 (diff) | |
| download | gcc-31007091b10944c358e5038a6271d7e2744cde37.zip gcc-31007091b10944c358e5038a6271d7e2744cde37.tar.gz gcc-31007091b10944c358e5038a6271d7e2744cde37.tar.bz2 | |
openmp: -fopenmp-simd fixes [PR98187]
This patch fixes two bugs in the -fopenmp-simd support. One is that
in C++ #pragma omp parallel master would actually create OMP_PARALLEL
in the IL, which is a big no-no for -fopenmp-simd, we should be creating
only the constructs -fopenmp-simd handles (mainly OMP_SIMD, OMP_LOOP which
is gimplified as simd in that case, declare simd/reduction and ordered simd).
The other bug was that #pragma omp master taskloop simd combined construct
contains simd and thus should be recognized as #pragma omp simd (with only
the simd applicable clauses), but as master wasn't included in
omp_pragmas_simd, we'd ignore it completely instead.
2020-12-08 Jakub Jelinek <jakub@redhat.com>
PR c++/98187
* c-pragma.c (omp_pragmas): Remove "master".
(omp_pragmas_simd): Add "master".
* parser.c (cp_parser_omp_parallel): For parallel master with
-fopenmp-simd only, just call cp_parser_omp_master instead of
wrapping it in OMP_PARALLEL.
* c-c++-common/gomp/pr98187.c: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/parser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index cc3da15..6aa42ef 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -40491,6 +40491,9 @@ cp_parser_omp_parallel (cp_parser *parser, cp_token *pragma_tok, cclauses = cclauses_buf; cp_lexer_consume_token (parser->lexer); + if (!flag_openmp) /* flag_openmp_simd */ + return cp_parser_omp_master (parser, pragma_tok, p_name, mask, + cclauses, if_p); block = begin_omp_parallel (); save = cp_parser_begin_omp_structured_block (parser); tree ret = cp_parser_omp_master (parser, pragma_tok, p_name, mask, |