da6f124d8a
* langhooks-def.h (LANG_HOOKS_OMP_CLAUSE_LINEAR_CTOR): Define. (LANG_HOOKS_DECLS): Add it. * gimplify.c (gimplify_omp_for): Make sure OMP_CLAUSE_LINEAR_STEP has correct type. * tree.h (OMP_CLAUSE_LINEAR_ARRAY): Define. * langhooks.h (struct lang_hooks_for_decls): Add omp_clause_linear_ctor hook. * omp-low.c (lower_rec_input_clauses): Set max_vf even if OMP_CLAUSE_LINEAR_ARRAY is set. Don't fold_convert OMP_CLAUSE_LINEAR_STEP. For OMP_CLAUSE_LINEAR_ARRAY in combined simd loop use omp_clause_linear_ctor hook. gcc/c/ * c-typeck.c (c_finish_omp_clauses): Make sure OMP_CLAUSE_LINEAR_STEP has correct type. gcc/cp/ * semantics.c (finish_omp_clauses): Make sure OMP_CLAUSE_LINEAR_STEP has correct type. gcc/fortran/ * trans.h (gfc_omp_clause_linear_ctor): New prototype. * trans-openmp.c (gfc_omp_linear_clause_add_loop, gfc_omp_clause_linear_ctor): New functions. (gfc_trans_omp_clauses): Make sure OMP_CLAUSE_LINEAR_STEP has correct type. Set OMP_CLAUSE_LINEAR_ARRAY flag if needed. * f95-lang.c (LANG_HOOKS_OMP_CLAUSE_LINEAR_CTOR): Redefine. libgomp/ * testsuite/libgomp.fortran/simd5.f90: New test. * testsuite/libgomp.fortran/simd6.f90: New test. * testsuite/libgomp.fortran/simd7.f90: New test. From-SVN: r211971
173 lines
9.2 KiB
Fortran
173 lines
9.2 KiB
Fortran
! { dg-do run }
|
|
! { dg-additional-options "-msse2" { target sse2_runtime } }
|
|
! { dg-additional-options "-mavx" { target avx_runtime } }
|
|
|
|
subroutine foo (d, e, f, g, m, n)
|
|
integer :: i, j, b(2:9), c(3:n), d(:), e(2:n), f(2:,3:), n
|
|
integer, allocatable :: g(:), h(:), k, m
|
|
logical :: l
|
|
l = .false.
|
|
allocate (h(2:7))
|
|
i = 4; j = 4; b = 7; c = 8; d = 9; e = 10; f = 11; g = 12; h = 13; k = 14; m = 15
|
|
!$omp simd linear(b)linear(c:2)linear(d:3)linear(e:4)linear(f:5)linear(g:6) &
|
|
!$omp & linear(h:7)linear(k:8)linear(m:9) reduction(.or.:l)
|
|
do i = 0, 63
|
|
l = l .or. .not.allocated (g) .or. .not.allocated (h)
|
|
l = l .or. .not.allocated (k) .or. .not.allocated (m)
|
|
l = l .or. any (b /= 7 + i) .or. any (c /= 8 + 2 * i)
|
|
l = l .or. any (d /= 9 + 3 * i) .or. any (e /= 10 + 4 * i)
|
|
l = l .or. any (f /= 11 + 5 * i) .or. any (g /= 12 + 6 * i)
|
|
l = l .or. any (h /= 13 + 7 * i) .or. (k /= 14 + 8 * i)
|
|
l = l .or. (m /= 15 + 9 * i)
|
|
l = l .or. (lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)
|
|
l = l .or. (lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)
|
|
l = l .or. (lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)
|
|
l = l .or. (lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)
|
|
l = l .or. (lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)
|
|
l = l .or. (lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)
|
|
l = l .or. (lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)
|
|
l = l .or. (lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)
|
|
b = b + 1; c = c + 2; d = d + 3; e = e + 4; f = f + 5; g = g + 6
|
|
h = h + 7; k = k + 8; m = m + 9
|
|
end do
|
|
if (l .or. i /= 64) call abort
|
|
if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) call abort
|
|
if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) call abort
|
|
if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) call abort
|
|
if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) call abort
|
|
if (m /= 15 + 9 * 64) call abort
|
|
if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) call abort
|
|
if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) call abort
|
|
if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) call abort
|
|
if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) call abort
|
|
if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) call abort
|
|
if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) call abort
|
|
if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) call abort
|
|
if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) call abort
|
|
i = 4; j = 4; b = 7; c = 8; d = 9; e = 10; f = 11; g = 12; h = 13; k = 14; m = 15
|
|
!$omp simd linear(b)linear(c:2)linear(d:3)linear(e:4)linear(f:5)linear(g:6) &
|
|
!$omp & linear(h:7)linear(k:8)linear(m:9) reduction(.or.:l) collapse(2)
|
|
do i = 0, 7
|
|
do j = 0, 7
|
|
l = l .or. .not.allocated (g) .or. .not.allocated (h)
|
|
l = l .or. .not.allocated (k) .or. .not.allocated (m)
|
|
l = l .or. any (b /= 7 + (8 * i + j)) .or. any (c /= 8 + 2 * (8 * i + j))
|
|
l = l .or. any (d /= 9 + 3 * (8 * i + j)) .or. any (e /= 10 + 4 * (8 * i + j))
|
|
l = l .or. any (f /= 11 + 5 * (8 * i + j)) .or. any (g /= 12 + 6 * (8 * i + j))
|
|
l = l .or. any (h /= 13 + 7 * (8 * i + j)) .or. (k /= 14 + 8 * (8 * i + j))
|
|
l = l .or. (m /= 15 + 9 * (8 * i + j))
|
|
l = l .or. (lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)
|
|
l = l .or. (lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)
|
|
l = l .or. (lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)
|
|
l = l .or. (lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)
|
|
l = l .or. (lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)
|
|
l = l .or. (lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)
|
|
l = l .or. (lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)
|
|
l = l .or. (lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)
|
|
b = b + 1; c = c + 2; d = d + 3; e = e + 4; f = f + 5; g = g + 6
|
|
h = h + 7; k = k + 8; m = m + 9
|
|
end do
|
|
end do
|
|
if (l .or. i /= 8 .or. j /= 8) call abort
|
|
if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) call abort
|
|
if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) call abort
|
|
if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) call abort
|
|
if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) call abort
|
|
if (m /= 15 + 9 * 64) call abort
|
|
if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) call abort
|
|
if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) call abort
|
|
if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) call abort
|
|
if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) call abort
|
|
if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) call abort
|
|
if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) call abort
|
|
if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) call abort
|
|
if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) call abort
|
|
i = 4; j = 4; b = 7; c = 8; d = 9; e = 10; f = 11; g = 12; h = 13; k = 14; m = 15
|
|
!$omp parallel do simd linear(b)linear(c:2)linear(d:3)linear(e:4)linear(f:5) &
|
|
!$omp & linear(g:6)linear(h:7)linear(k:8)linear(m:9) reduction(.or.:l)
|
|
do i = 0, 63
|
|
l = l .or. .not.allocated (g) .or. .not.allocated (h)
|
|
l = l .or. .not.allocated (k) .or. .not.allocated (m)
|
|
l = l .or. any (b /= 7 + i) .or. any (c /= 8 + 2 * i)
|
|
l = l .or. any (d /= 9 + 3 * i) .or. any (e /= 10 + 4 * i)
|
|
l = l .or. any (f /= 11 + 5 * i) .or. any (g /= 12 + 6 * i)
|
|
l = l .or. any (h /= 13 + 7 * i) .or. (k /= 14 + 8 * i)
|
|
l = l .or. (m /= 15 + 9 * i)
|
|
l = l .or. (lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)
|
|
l = l .or. (lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)
|
|
l = l .or. (lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)
|
|
l = l .or. (lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)
|
|
l = l .or. (lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)
|
|
l = l .or. (lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)
|
|
l = l .or. (lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)
|
|
l = l .or. (lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)
|
|
b = b + 1; c = c + 2; d = d + 3; e = e + 4; f = f + 5; g = g + 6
|
|
h = h + 7; k = k + 8; m = m + 9
|
|
end do
|
|
if (l .or. i /= 64) call abort
|
|
if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) call abort
|
|
if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) call abort
|
|
if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) call abort
|
|
if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) call abort
|
|
if (m /= 15 + 9 * 64) call abort
|
|
if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) call abort
|
|
if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) call abort
|
|
if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) call abort
|
|
if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) call abort
|
|
if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) call abort
|
|
if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) call abort
|
|
if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) call abort
|
|
if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) call abort
|
|
i = 4; j = 4; b = 7; c = 8; d = 9; e = 10; f = 11; g = 12; h = 13; k = 14; m = 15
|
|
!$omp parallel do simd linear(b)linear(c:2)linear(d:3)linear(e:4)linear(f:5) &
|
|
!$omp & linear(g:6)linear(h:7)linear(k:8)linear(m:9) reduction(.or.:l) collapse(2)
|
|
do i = 0, 7
|
|
do j = 0, 7
|
|
l = l .or. .not.allocated (g) .or. .not.allocated (h)
|
|
l = l .or. .not.allocated (k) .or. .not.allocated (m)
|
|
l = l .or. any (b /= 7 + (8 * i + j)) .or. any (c /= 8 + 2 * (8 * i + j))
|
|
l = l .or. any (d /= 9 + 3 * (8 * i + j)) .or. any (e /= 10 + 4 * (8 * i + j))
|
|
l = l .or. any (f /= 11 + 5 * (8 * i + j)) .or. any (g /= 12 + 6 * (8 * i + j))
|
|
l = l .or. any (h /= 13 + 7 * (8 * i + j)) .or. (k /= 14 + 8 * (8 * i + j))
|
|
l = l .or. (m /= 15 + 9 * (8 * i + j))
|
|
l = l .or. (lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)
|
|
l = l .or. (lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)
|
|
l = l .or. (lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)
|
|
l = l .or. (lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)
|
|
l = l .or. (lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)
|
|
l = l .or. (lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)
|
|
l = l .or. (lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)
|
|
l = l .or. (lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)
|
|
b = b + 1; c = c + 2; d = d + 3; e = e + 4; f = f + 5; g = g + 6
|
|
h = h + 7; k = k + 8; m = m + 9
|
|
end do
|
|
end do
|
|
if (l .or. i /= 8 .or. j /= 8) call abort
|
|
if (any (b /= 7 + 64) .or. any (c /= 8 + 2 * 64)) call abort
|
|
if (any (d /= 9 + 3 * 64) .or. any (e /= 10 + 4 * 64)) call abort
|
|
if (any (f /= 11 + 5 * 64) .or. any (g /= 12 + 6 * 64)) call abort
|
|
if (any (h /= 13 + 7 * 64) .or. (k /= 14 + 8 * 64)) call abort
|
|
if (m /= 15 + 9 * 64) call abort
|
|
if ((lbound (b, 1) /= 2) .or. (ubound (b, 1) /= 9)) call abort
|
|
if ((lbound (c, 1) /= 3) .or. (ubound (c, 1) /= n)) call abort
|
|
if ((lbound (d, 1) /= 1) .or. (ubound (d, 1) /= 17)) call abort
|
|
if ((lbound (e, 1) /= 2) .or. (ubound (e, 1) /= n)) call abort
|
|
if ((lbound (f, 1) /= 2) .or. (ubound (f, 1) /= 3)) call abort
|
|
if ((lbound (f, 2) /= 3) .or. (ubound (f, 2) /= 5)) call abort
|
|
if ((lbound (g, 1) /= 7) .or. (ubound (g, 1) /= 10)) call abort
|
|
if ((lbound (h, 1) /= 2) .or. (ubound (h, 1) /= 7)) call abort
|
|
end subroutine
|
|
|
|
interface
|
|
subroutine foo (d, e, f, g, m, n)
|
|
integer :: d(:), e(2:n), f(2:,3:), n
|
|
integer, allocatable :: g(:), m
|
|
end subroutine
|
|
end interface
|
|
integer, parameter :: n = 8
|
|
integer :: d(2:18), e(3:n+1), f(5:6,7:9)
|
|
integer, allocatable :: g(:), m
|
|
allocate (g(7:10))
|
|
call foo (d, e, f, g, m, n)
|
|
end
|