From 100291de48d70d56f8ec31e8ba8d9edd1ee95b45 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 10 Jul 2018 09:27:37 +0200 Subject: [PATCH] re PR fortran/86421 (OpenMP declare simd linear ref in module causes gfortran to bail out) PR fortran/86421 * module.c (omp_declare_simd_clauses): Add LINEAR with _REF, _VAL and _UVAL suffixes. (mio_omp_declare_simd): Save and restore ref, val and uval modifiers on linear clauses. Initialize n->where to gfc_current_locus. * gfortran.dg/vect/pr86421.f90: New test. From-SVN: r262535 --- gcc/fortran/ChangeLog | 8 +++++ gcc/fortran/module.c | 17 ++++++++++- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/vect/pr86421.f90 | 35 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/vect/pr86421.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3134580fa5a..e7bd20fe03c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2018-07-10 Jakub Jelinek + + PR fortran/86421 + * module.c (omp_declare_simd_clauses): Add LINEAR with _REF, _VAL and + _UVAL suffixes. + (mio_omp_declare_simd): Save and restore ref, val and uval modifiers + on linear clauses. Initialize n->where to gfc_current_locus. + 2018-07-05 Paul Thomas PR fortran/86408 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index c833e67f71f..a313c3b28f4 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4098,6 +4098,9 @@ static const mstring omp_declare_simd_clauses[] = minit ("UNIFORM", 3), minit ("LINEAR", 4), minit ("ALIGNED", 5), + minit ("LINEAR_REF", 33), + minit ("LINEAR_VAL", 34), + minit ("LINEAR_UVAL", 35), minit (NULL, -1) }; @@ -4140,7 +4143,10 @@ mio_omp_declare_simd (gfc_namespace *ns, gfc_omp_declare_simd **odsp) } for (n = ods->clauses->lists[OMP_LIST_LINEAR]; n; n = n->next) { - mio_name (4, omp_declare_simd_clauses); + if (n->u.linear_op == OMP_LINEAR_DEFAULT) + mio_name (4, omp_declare_simd_clauses); + else + mio_name (32 + n->u.linear_op, omp_declare_simd_clauses); mio_symbol_ref (&n->sym); mio_expr (&n->expr); } @@ -4181,11 +4187,20 @@ mio_omp_declare_simd (gfc_namespace *ns, gfc_omp_declare_simd **odsp) case 4: case 5: *ptrs[t - 3] = n = gfc_get_omp_namelist (); + finish_namelist: + n->where = gfc_current_locus; ptrs[t - 3] = &n->next; mio_symbol_ref (&n->sym); if (t != 3) mio_expr (&n->expr); break; + case 33: + case 34: + case 35: + *ptrs[1] = n = gfc_get_omp_namelist (); + n->u.linear_op = (enum gfc_omp_linear_op) (t - 32); + t = 4; + goto finish_namelist; } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8e2abceb459..e2bc00d18f3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-07-10 Jakub Jelinek + + PR fortran/86421 + * gfortran.dg/vect/pr86421.f90: New test. + 2018-07-09 Martin Sebor PR tree-optimization/86415 diff --git a/gcc/testsuite/gfortran.dg/vect/pr86421.f90 b/gcc/testsuite/gfortran.dg/vect/pr86421.f90 new file mode 100644 index 00000000000..af40f40da9e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/vect/pr86421.f90 @@ -0,0 +1,35 @@ +! PR fortran/86421 +! { dg-require-effective-target vect_simd_clones } +! { dg-additional-options "-fopenmp-simd" } +! { dg-additional-options "-mavx" { target avx_runtime } } + +module mod86421 + implicit none +contains + subroutine foo(x, y, z) + real :: x + integer :: y, z + !$omp declare simd linear(ref(x)) linear(val(y)) linear(uval(z)) + x = x + y + z = z + 1 + end subroutine +end module mod86421 + +program pr86421 + use mod86421 + implicit none + integer :: i, j + real :: a(64) + j = 0 + do i = 1, 64 + a(i) = i + end do + !$omp simd + do i = 1, 64 + call foo (a(i), i, j) + end do + do i = 1, 64 + if (a(i) .ne. (2 * i)) stop 1 + end do + if (j .ne. 64) stop 2 +end program pr86421 -- 2.30.2