Fortran/OpenMP: Fix -fopenmp-simd for 'omp assume(s)'
Checks
Commit Message
Found by chance recently; I thought about a couple of ways to handle it
but then settled to the proposed solution.
OK for mainline?
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
Comments
On Thu, Feb 09, 2023 at 09:56:09AM +0100, Tobias Burnus wrote:
> Found by chance recently; I thought about a couple of ways to handle it
> but then settled to the proposed solution.
>
> OK for mainline?
>
> Tobias
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
> Fortran/OpenMP: Fix -fopenmp-simd for 'omp assume(s)'
>
> While 'omp assume' is enabled by -fopenmp-simd, 'omp assumes' is not;
> however, due to the way parsing works in Fortran (esp. for fixed-form
> source code), 'assumes' was parsed by 'assume' which then stumbled over
> the tailing 's'.
>
> gcc/fortran/
>
> * parse.cc (decode_omp_directive): Really ignore 'assumes' with
> -fopenmp-simd.
>
> gcc/testsuite/
>
> * gfortran.dg/gomp/openmp-simd-8.f90: New test.
Ok.
Jakub
Fortran/OpenMP: Fix -fopenmp-simd for 'omp assume(s)'
While 'omp assume' is enabled by -fopenmp-simd, 'omp assumes' is not;
however, due to the way parsing works in Fortran (esp. for fixed-form
source code), 'assumes' was parsed by 'assume' which then stumbled over
the tailing 's'.
gcc/fortran/
* parse.cc (decode_omp_directive): Really ignore 'assumes' with
-fopenmp-simd.
gcc/testsuite/
* gfortran.dg/gomp/openmp-simd-8.f90: New test.
gcc/fortran/parse.cc | 3 +++
gcc/testsuite/gfortran.dg/gomp/openmp-simd-8.f90 | 25 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
@@ -885,6 +885,9 @@ decode_omp_directive (void)
switch (c)
{
case 'a':
+ /* For -fopenmp-simd, ignore 'assumes'; note no clause starts with 's'. */
+ if (!flag_openmp && gfc_match ("assumes") == MATCH_YES)
+ break;
matcho ("assumes", gfc_match_omp_assumes, ST_OMP_ASSUMES);
matchs ("assume", gfc_match_omp_assume, ST_OMP_ASSUME);
matcho ("atomic", gfc_match_omp_atomic, ST_OMP_ATOMIC);
new file mode 100644
@@ -0,0 +1,25 @@
+! { dg-options "-fno-openmp -fopenmp-simd -fdump-tree-original" }
+
+! While 'omp assumes' is ignored with -fopenmp-simd,
+! 'omp assume' is processed - check that this works.
+
+module m
+ !$omp assumes no_openmp invalid_clause ! Should get ignored
+contains
+ integer function foo()
+ foo = 5
+ end function
+end
+
+program main
+ use m
+ implicit none
+ !$omp assumes no_openmp ! likewise ignored
+ integer :: n
+ !$omp assume holds (foo() > 0) ! should be honoured
+ n = foo()
+ if (n == 0) stop
+ !$omp end assume
+end
+
+! { dg-final { scan-tree-dump "\\.ASSUME \\(foo \\(\\) > 0\\);" "original" } }