From 5c341c056b0706d88a03a10061cdaf356b737bb4 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 5 Oct 2022 15:39:03 +0200 Subject: [PATCH] OpenMP: Update invoke.texi and fix fortran/parse.cc for -fopenmp-simd Split off from the 'Fortran: Add OpenMP's assume(s) directives' patch. gcc/ * doc/invoke.texi (-fopenmp): Mention C++ attribut syntax. (-fopenmp-simd): Likewise; update permitted directives. gcc/fortran/ * parse.cc (decode_omp_directive): Handle '(end) loop' and 'scan' also with -fopenmp-simd. gcc/testsuite/ * gfortran.dg/gomp/openmp-simd-7.f90: New test. (cherry picked from commit 8792047470073df0da4a5b91997d6058193d7676) --- gcc/ChangeLog.omp | 8 +++++++ gcc/doc/invoke.texi | 12 ++++++---- gcc/fortran/ChangeLog.omp | 8 +++++++ gcc/fortran/parse.cc | 6 ++--- gcc/testsuite/ChangeLog.omp | 7 ++++++ .../gfortran.dg/gomp/openmp-simd-7.f90 | 23 +++++++++++++++++++ 6 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/gomp/openmp-simd-7.f90 diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 72151ab26736..52bc562d95ec 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-10-05 Tobias Burnus + + Backport from mainline: + 2022-10-04 Tobias Burnus + + * doc/invoke.texi (-fopenmp): Mention C++ attribut syntax. + (-fopenmp-simd): Likewise; update permitted directives. + 2022-10-05 Tobias Burnus Backport from mainline: diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 52ba1c84bec3..8bd727900560 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -2746,7 +2746,8 @@ permitted. @item -fopenmp @opindex fopenmp @cindex OpenMP parallel -Enable handling of OpenMP directives @code{#pragma omp} in C/C++ and +Enable handling of OpenMP directives @code{#pragma omp} in C/C++, +@code{[[omp::directive(...)]]} and @code{[[omp::sequence(...)]]} in C++ and @code{!$omp} in Fortran. When @option{-fopenmp} is specified, the compiler generates parallel code according to the OpenMP Application Program Interface v4.5 @w{@uref{https://www.openmp.org}}. This option @@ -2758,9 +2759,12 @@ have support for @option{-pthread}. @option{-fopenmp} implies @opindex fopenmp-simd @cindex OpenMP SIMD @cindex SIMD -Enable handling of OpenMP's SIMD directives with @code{#pragma omp} -in C/C++ and @code{!$omp} in Fortran. Other OpenMP directives -are ignored. +Enable handling of OpenMP's @code{simd}, @code{declare simd}, +@code{declare reduction}, @code{assume}, @code{ordered}, @code{scan}, +@code{loop} directives and combined or composite directives with +@code{simd} as constituent with @code{#pragma omp} in C/C++, +@code{[[omp::directive(...)]]} and @code{[[omp::sequence(...)]]} in C++ +and @code{!$omp} in Fortran. Other OpenMP directives are ignored. @item -fopenmp-target-simd-clone @opindex fopenmp-target-simd-clone diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index 5d056d031c5a..e1f67c8c0c39 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-10-05 Tobias Burnus + + Backport from mainline: + 2022-10-04 Tobias Burnus + + * parse.cc (decode_omp_directive): Handle '(end) loop' and 'scan' + also with -fopenmp-simd. + 2022-09-30 Tobias Burnus Backport from mainline: diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc index fc88111a7adf..28d9cccdd258 100644 --- a/gcc/fortran/parse.cc +++ b/gcc/fortran/parse.cc @@ -931,7 +931,7 @@ decode_omp_directive (void) matcho ("end distribute", gfc_match_omp_eos_error, ST_OMP_END_DISTRIBUTE); matchs ("end do simd", gfc_match_omp_end_nowait, ST_OMP_END_DO_SIMD); matcho ("end do", gfc_match_omp_end_nowait, ST_OMP_END_DO); - matcho ("end loop", gfc_match_omp_eos_error, ST_OMP_END_LOOP); + matchs ("end loop", gfc_match_omp_eos_error, ST_OMP_END_LOOP); matchs ("end simd", gfc_match_omp_eos_error, ST_OMP_END_SIMD); matcho ("end masked taskloop simd", gfc_match_omp_eos_error, ST_OMP_END_MASKED_TASKLOOP_SIMD); @@ -1034,7 +1034,7 @@ decode_omp_directive (void) matcho ("nothing", gfc_match_omp_nothing, ST_NONE); break; case 'l': - matcho ("loop", gfc_match_omp_loop, ST_OMP_LOOP); + matchs ("loop", gfc_match_omp_loop, ST_OMP_LOOP); break; case 'o': if (gfc_match ("ordered depend (") == MATCH_YES @@ -1081,7 +1081,7 @@ decode_omp_directive (void) matcho ("requires", gfc_match_omp_requires, ST_OMP_REQUIRES); break; case 's': - matcho ("scan", gfc_match_omp_scan, ST_OMP_SCAN); + matchs ("scan", gfc_match_omp_scan, ST_OMP_SCAN); matcho ("scope", gfc_match_omp_scope, ST_OMP_SCOPE); matcho ("sections", gfc_match_omp_sections, ST_OMP_SECTIONS); matcho ("section", gfc_match_omp_eos_error, ST_OMP_SECTION); diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 9dc42e628229..b26b68f3e3e5 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,10 @@ +2022-10-05 Tobias Burnus + + Backport from mainline: + 2022-10-04 Tobias Burnus + + * gfortran.dg/gomp/openmp-simd-7.f90: New test. + 2022-10-04 Tobias Burnus Backport from mainline: diff --git a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-7.f90 b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-7.f90 new file mode 100644 index 000000000000..d7010bb42883 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-7.f90 @@ -0,0 +1,23 @@ +! { dg-options "-fno-openmp -fopenmp-simd -fdump-tree-original" } + +subroutine foo (a, b) + integer, contiguous :: a(:), b(:) + integer :: i + !$omp simd reduction (inscan, +:r) + do i = 1, 1024 + r = r + a(i) + !$omp scan inclusive(r) + b(i) = r + end do + !$omp end simd + + !$omp loop + do i = 1, 1024 + a(i) = a(i) + i + end do + !$omp end loop +end + +! { dg-final { scan-tree-dump "#pragma omp simd linear\\(i:1\\) reduction\\(inscan,\\+:r\\)" "original" } } +! { dg-final { scan-tree-dump "#pragma omp scan inclusive\\(r\\)" "original" } } +! { dg-final { scan-tree-dump "#pragma omp loop" "original" } } -- 2.47.2