From 1d58d86b208eba62e3c96224e6d3f9652ce0640b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 30 Aug 2019 13:09:22 +0200 Subject: [PATCH] backport: re PR fortran/87725 (OpenMP 4.5 clause schedule(simd,monotonic:static) not understood) Backported from mainline 2018-10-25 Jakub Jelinek PR fortran/87725 * openmp.c (gfc_match_omp_clauses): Parse simd, monotonic and nonmonotonic modifiers regardless of if they have been parsed already or if the opposite one has. Fix up check whether comma after modifier should be parsed. (resolve_omp_clauses): Diagnose schedule modifier restrictions. * c-c++-common/gomp/schedule-modifiers-1.c (bar): Separate modifier from kind with a colon rather than comma. * gfortran.dg/gomp/schedule-modifiers-1.f90: New test. * gfortran.dg/gomp/schedule-modifiers-2.f90: New test. From-SVN: r275067 --- gcc/fortran/ChangeLog | 14 ++++- gcc/fortran/openmp.c | 37 ++++++++--- gcc/testsuite/ChangeLog | 8 +++ .../c-c++-common/gomp/schedule-modifiers-1.c | 8 +-- .../gfortran.dg/gomp/schedule-modifiers-1.f90 | 63 +++++++++++++++++++ .../gfortran.dg/gomp/schedule-modifiers-2.f90 | 44 +++++++++++++ 6 files changed, 160 insertions(+), 14 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-1.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0388a116e660..073157d63193 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,17 @@ +2019-08-30 Jakub Jelinek + + Backported from mainline + 2018-10-25 Jakub Jelinek + + PR fortran/87725 + * openmp.c (gfc_match_omp_clauses): Parse simd, monotonic and + nonmonotonic modifiers regardless of if they have been parsed + already or if the opposite one has. Fix up check whether + comma after modifier should be parsed. + (resolve_omp_clauses): Diagnose schedule modifier restrictions. + 2019-08-03 Thomas Koenig - Paul Thomas + Paul Thomas Backport from trunk PR fortran/90786 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 8f7c622bbedc..76dd5552ab94 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -1699,22 +1699,17 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask, locus old_loc2 = gfc_current_locus; do { - if (!c->sched_simd - && gfc_match ("simd") == MATCH_YES) + if (gfc_match ("simd") == MATCH_YES) { c->sched_simd = true; nmodifiers++; } - else if (!c->sched_monotonic - && !c->sched_nonmonotonic - && gfc_match ("monotonic") == MATCH_YES) + else if (gfc_match ("monotonic") == MATCH_YES) { c->sched_monotonic = true; nmodifiers++; } - else if (!c->sched_monotonic - && !c->sched_nonmonotonic - && gfc_match ("nonmonotonic") == MATCH_YES) + else if (gfc_match ("nonmonotonic") == MATCH_YES) { c->sched_nonmonotonic = true; nmodifiers++; @@ -1725,7 +1720,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask, gfc_current_locus = old_loc2; break; } - if (nmodifiers == 0 + if (nmodifiers == 1 && gfc_match (" , ") == MATCH_YES) continue; else if (gfc_match (" : ") == MATCH_YES) @@ -4062,6 +4057,30 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, gfc_warning (0, "INTEGER expression of SCHEDULE clause's chunk_size " "at %L must be positive", &expr->where); } + if (omp_clauses->sched_kind != OMP_SCHED_NONE + && omp_clauses->sched_nonmonotonic) + { + if (omp_clauses->sched_kind != OMP_SCHED_DYNAMIC + && omp_clauses->sched_kind != OMP_SCHED_GUIDED) + { + const char *p; + switch (omp_clauses->sched_kind) + { + case OMP_SCHED_STATIC: p = "STATIC"; break; + case OMP_SCHED_RUNTIME: p = "RUNTIME"; break; + case OMP_SCHED_AUTO: p = "AUTO"; break; + default: gcc_unreachable (); + } + gfc_error ("NONMONOTONIC modifier specified for %s schedule kind " + "at %L", p, &code->loc); + } + else if (omp_clauses->sched_monotonic) + gfc_error ("Both MONOTONIC and NONMONOTONIC schedule modifiers " + "specified at %L", &code->loc); + else if (omp_clauses->ordered) + gfc_error ("NONMONOTONIC schedule modifier specified with ORDERED " + "clause at %L", &code->loc); + } /* Check that no symbol appears on multiple clauses, except that a symbol can appear on both firstprivate and lastprivate. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 68b0effa4203..6ca9f2421b68 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,14 @@ 2019-08-30 Jakub Jelinek Backported from mainline + 2018-10-25 Jakub Jelinek + + PR fortran/87725 + * c-c++-common/gomp/schedule-modifiers-1.c (bar): Separate modifier + from kind with a colon rather than comma. + * gfortran.dg/gomp/schedule-modifiers-1.f90: New test. + * gfortran.dg/gomp/schedule-modifiers-2.f90: New test. + 2018-10-20 Jakub Jelinek PR middle-end/87647 diff --git a/gcc/testsuite/c-c++-common/gomp/schedule-modifiers-1.c b/gcc/testsuite/c-c++-common/gomp/schedule-modifiers-1.c index 7edea1b147cc..33ca3a6534d7 100644 --- a/gcc/testsuite/c-c++-common/gomp/schedule-modifiers-1.c +++ b/gcc/testsuite/c-c++-common/gomp/schedule-modifiers-1.c @@ -80,21 +80,21 @@ bar (void) #pragma omp for schedule (nonmonotonic : auto) /* { dg-error ".nonmonotonic. modifier specified for .auto. schedule kind" } */ for (i = 0; i < 64; i++) ; - #pragma omp for schedule (nonmonotonic, dynamic) ordered /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ + #pragma omp for schedule (nonmonotonic : dynamic) ordered /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ for (i = 0; i < 64; i++) #pragma omp ordered ; - #pragma omp for ordered schedule(nonmonotonic, dynamic, 5) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ + #pragma omp for ordered schedule(nonmonotonic : dynamic, 5) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ for (i = 0; i < 64; i++) #pragma omp ordered ; - #pragma omp for schedule (nonmonotonic, guided) ordered(1) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ + #pragma omp for schedule (nonmonotonic : guided) ordered(1) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ for (i = 0; i < 64; i++) { #pragma omp ordered depend(sink: i - 1) #pragma omp ordered depend(source) } - #pragma omp for ordered(1) schedule(nonmonotonic, guided, 2) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ + #pragma omp for ordered(1) schedule(nonmonotonic : guided, 2) /* { dg-error ".nonmonotonic. schedule modifier specified together with .ordered. clause" } */ for (i = 0; i < 64; i++) { #pragma omp ordered depend(source) diff --git a/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-1.f90 b/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-1.f90 new file mode 100644 index 000000000000..9618e3983750 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-1.f90 @@ -0,0 +1,63 @@ +! { dg-do compile } +! { dg-options "-fopenmp" } + +subroutine foo + integer :: i + !$omp do simd schedule (simd, simd: static, 5) + do i = 0, 64 + end do + !$omp do simd schedule (monotonic, simd: static) + do i = 0, 64 + end do + !$omp do simd schedule (simd , monotonic : static, 6) + do i = 0, 64 + end do + !$omp do schedule (monotonic, monotonic : static, 7) + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic, nonmonotonic : dynamic) + do i = 0, 64 + end do + !$omp do simd schedule (nonmonotonic , simd : dynamic, 3) + do i = 0, 64 + end do + !$omp do simd schedule (nonmonotonic,simd:guided,4) + do i = 0, 64 + end do + !$omp do schedule (monotonic: static, 2) + do i = 0, 64 + end do + !$omp do schedule (monotonic : static) + do i = 0, 64 + end do + !$omp do schedule (monotonic : dynamic) + do i = 0, 64 + end do + !$omp do schedule (monotonic : dynamic, 3) + do i = 0, 64 + end do + !$omp do schedule (monotonic : guided) + do i = 0, 64 + end do + !$omp do schedule (monotonic : guided, 7) + do i = 0, 64 + end do + !$omp do schedule (monotonic : runtime) + do i = 0, 64 + end do + !$omp do schedule (monotonic : auto) + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : dynamic) + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : dynamic, 3) + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : guided) + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : guided, 7) + do i = 0, 64 + end do +end subroutine foo diff --git a/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-2.f90 b/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-2.f90 new file mode 100644 index 000000000000..0be53cc71a5d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/schedule-modifiers-2.f90 @@ -0,0 +1,44 @@ +! { dg-do compile } +! { dg-options "-fopenmp" } + +subroutine foo + integer :: i + !$omp do schedule (nonmonotonic: static, 2) ! { dg-error "NONMONOTONIC modifier specified for STATIC schedule kind" } + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : static) ! { dg-error "NONMONOTONIC modifier specified for STATIC schedule kind" } + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : runtime) ! { dg-error "NONMONOTONIC modifier specified for RUNTIME schedule kind" } + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : auto) ! { dg-error "NONMONOTONIC modifier specified for AUTO schedule kind" } + do i = 0, 64 + end do + !$omp do schedule (nonmonotonic : dynamic) ordered ! { dg-error "NONMONOTONIC schedule modifier specified with ORDERED clause" } + do i = 0, 64 + !$omp ordered + !$omp end ordered + end do + !$omp do ordered schedule(nonmonotonic : dynamic, 5) ! { dg-error "NONMONOTONIC schedule modifier specified with ORDERED clause" } + do i = 0, 64 + !$omp ordered + !$omp end ordered + end do + !$omp do schedule (nonmonotonic : guided) ordered(1) ! { dg-error "NONMONOTONIC schedule modifier specified with ORDERED clause" } + do i = 0, 64 + !$omp ordered depend(sink: i - 1) + !$omp ordered depend(source) + end do + !$omp do ordered(1) schedule(nonmonotonic : guided, 2) ! { dg-error "NONMONOTONIC schedule modifier specified with ORDERED clause" } + do i = 0, 64 + !$omp ordered depend(source) + !$ordered depend(sink: i - 1) + end do + !$omp do schedule (nonmonotonic , monotonic : dynamic) ! { dg-error "Both MONOTONIC and NONMONOTONIC schedule modifiers specified" } + do i = 0, 64 + end do + !$omp do schedule (monotonic,nonmonotonic:dynamic) ! { dg-error "Both MONOTONIC and NONMONOTONIC schedule modifiers specified" } + do i = 0, 64 + end do +end subroutine foo -- 2.47.2