mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fortran: OpenMP fix declare simd inside modules and absent linear step [PR106566]

Browse Source 
gcc/fortran/ChangeLog:

	PR fortran/106566
	* openmp.cc (gfc_match_omp_clauses): Fix setting linear-step value
	to 1 when not specified.
	(gfc_match_omp_declare_simd): Accept module procedures.

gcc/testsuite/ChangeLog:

	PR fortran/106566
	* gfortran.dg/gomp/declare-simd-4.f90: New test.
	* gfortran.dg/gomp/declare-simd-5.f90: New test.
	* gfortran.dg/gomp/declare-simd-6.f90: New test.
This commit is contained in:
Tobias Burnus 2022-08-17 16:19:58 +02:00
parent 027b281f1e
commit 1513512ec7
4 changed files with 140 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/fortran/openmp.cc
View File

@ -2480,7 +2480,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
goto error;
}
}
else
if (step == NULL)
{
step = gfc_get_constant_expr (BT_INTEGER,
gfc_default_integer_kind,
@ -4213,9 +4213,13 @@ gfc_match_omp_declare_simd (void)
gfc_omp_declare_simd *ods;
bool needs_space = false;
switch (gfc_match (" ( %s ) ", &proc_name))
switch (gfc_match (" ( "))
{
case MATCH_YES: break;
case MATCH_YES:
if (gfc_match_symbol (&proc_name, /* host assoc = */ true) != MATCH_YES
|| gfc_match (" ) ") != MATCH_YES)
return MATCH_ERROR;
break;
case MATCH_NO: proc_name = NULL; needs_space = true; break;
case MATCH_ERROR: return MATCH_ERROR;
}

42
gcc/testsuite/gfortran.dg/gomp/declare-simd-4.f90 Normal file
View File

@ -0,0 +1,42 @@
! { dg-do compile }
! { dg-additional-options "-fdump-tree-gimple" }
!
! PR fortran/106566
!
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare simd \\(linear\\(0:ref,step\\(4\\)\\) simdlen\\(8\\)\\)\\)\\)" 2 "gimple" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare simd \\(linear\\(0:ref,step\\(8\\)\\) simdlen\\(8\\)\\)\\)\\)" 2 "gimple" } }
subroutine add_one2(p)
implicit none
!$omp declare simd(add_one2) linear(p: ref) simdlen(8)
integer(kind=4) :: p
p = p + 1
end subroutine
subroutine linear_add_one2(p)
implicit none
!$omp declare simd(linear_add_one2) linear(p: ref, step(2)) simdlen(8)
integer(kind=4) :: p
p = p + 1
end subroutine
module m
integer, parameter :: NN = 1023
integer(kind=4) :: a(NN)
contains
subroutine module_add_one2(q)
implicit none
!$omp declare simd(module_add_one2) linear(q: ref) simdlen(8)
integer(kind=4) :: q
q = q + 1
end subroutine
subroutine linear_add_one2(q)
implicit none
!$omp declare simd(linear_add_one2) linear(q: ref, step(2)) simdlen(8)
integer(kind=4) :: q
q = q + 1
end subroutine
end module

49
gcc/testsuite/gfortran.dg/gomp/declare-simd-5.f90 Normal file
View File

@ -0,0 +1,49 @@
! { dg-do compile }
!
! PR fortran/106566
!
subroutine add_one2(p)
implicit none
procedure(add_one2) :: ext1
!$omp declare simd(ext1) linear(p: ref) simdlen(8) ! { dg-error "OMP DECLARE SIMD should refer to containing procedure 'add_one2'" }
integer :: p
p = p + 1
end subroutine
subroutine linear_add_one2(p)
implicit none
procedure(linear_add_one2) :: ext2
!$omp declare simd(ext2) linear(p: ref, step(2)) simdlen(8) ! { dg-error "OMP DECLARE SIMD should refer to containing procedure 'linear_add_one2'" }
integer :: p
p = p + 1
end subroutine
module m
integer, parameter :: NN = 1023
integer :: a(NN)
contains
subroutine some_proc(r)
integer :: r
end subroutine
subroutine module_add_one2(q)
implicit none
!$omp declare simd(some_proc) linear(q: ref) simdlen(8) ! { dg-error "OMP DECLARE SIMD should refer to containing procedure 'module_add_one2'" }
integer :: q
q = q + 1
end subroutine
subroutine module_linear_add_one2(q)
implicit none
interface
subroutine other_proc(r)
integer :: r
end subroutine
end interface
!$omp declare simd(other_proc) linear(q: ref, step(2)) simdlen(8) ! { dg-error "OMP DECLARE SIMD should refer to containing procedure 'module_linear_add_one2'" }
integer :: q
q = q + 1
end subroutine
end module

42
gcc/testsuite/gfortran.dg/gomp/declare-simd-6.f90 Normal file
View File

@ -0,0 +1,42 @@
! { dg-do compile }
! { dg-additional-options "-fdump-tree-gimple" }
!
! PR fortran/106566
!
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare simd \\(linear\\(ref\\(0\\):4\\) simdlen\\(8\\)\\)\\)\\)" 2 "gimple" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare simd \\(linear\\(ref\\(0\\):8\\) simdlen\\(8\\)\\)\\)\\)" 2 "gimple" } }
subroutine add_one2(p)
implicit none
!$omp declare simd(add_one2) linear(ref(p)) simdlen(8)
integer(kind=4) :: p
p = p + 1
end subroutine
subroutine linear_add_one2(p)
implicit none
!$omp declare simd(linear_add_one2) linear(ref(p) : 2) simdlen(8)
integer(kind=4) :: p
p = p + 1
end subroutine
module m
integer, parameter :: NN = 1023
integer(kind=4) :: a(NN)
contains
subroutine module_add_one2(q)
implicit none
!$omp declare simd(module_add_one2) linear(ref(q)) simdlen(8)
integer(kind=4) :: q
q = q + 1
end subroutine
subroutine linear_add_one2(q)
implicit none
!$omp declare simd(linear_add_one2) linear(ref(q) : 2) simdlen(8)
integer(kind=4) :: q
q = q + 1
end subroutine
end module