b46ebd6c7b
* gimplify.c (gimplify_scan_omp_clauses) <case OMP_CLAUSE_MAP,
OMP_CLAUSE_TO, OMP_CLAUSE_FROM): Make sure OMP_CLAUSE_SIZE is
non-NULL.
<case OMP_CLAUSE_ALIGNED>: Gimplify OMP_CLAUSE_ALIGNED_ALIGNMENT.
(gimplify_adjust_omp_clauses_1): Make sure OMP_CLAUSE_SIZE is
non-NULL.
(gimplify_adjust_omp_clauses): Likewise.
* omp-low.c (lower_rec_simd_input_clauses,
lower_rec_input_clauses, expand_omp_simd): Handle non-constant
safelen the same as safelen(1).
* tree-nested.c (convert_nonlocal_omp_clauses,
convert_local_omp_clauses): Handle OMP_CLAUSE_ALIGNED. For
OMP_CLAUSE_{MAP,TO,FROM} if not decl use walk_tree.
(convert_nonlocal_reference_stmt, convert_local_reference_stmt):
Fixup handling of GIMPLE_OMP_TARGET.
(convert_tramp_reference_stmt, convert_gimple_call): Handle
GIMPLE_OMP_TARGET.
gcc/fortran/
* dump-parse-tree.c (show_omp_namelist): Use n->udr->udr instead
of n->udr.
* f95-lang.c (gfc_init_builtin_functions): Initialize
BUILT_IN_ASSUME_ALIGNED.
* gfortran.h (gfc_omp_namelist): Change udr field type to
struct gfc_omp_namelist_udr.
(gfc_omp_namelist_udr): New type.
(gfc_get_omp_namelist_udr): Define.
(gfc_resolve_code): New prototype.
* match.c (gfc_free_omp_namelist): Free name->udr.
* module.c (intrinsics): Add INTRINSIC_USER.
(fix_mio_expr): Likewise.
(mio_expr): Handle INSTRINSIC_USER and non-resolved EXPR_FUNCTION.
* openmp.c (gfc_match_omp_clauses): Adjust initialization of n->udr.
(gfc_match_omp_declare_reduction): Treat len=: the same as len=*.
Set attr.flavor on omp_{out,in,priv,orig} artificial variables.
(struct resolve_omp_udr_callback_data): New type.
(resolve_omp_udr_callback, resolve_omp_udr_callback2,
resolve_omp_udr_clause): New functions.
(resolve_omp_clauses): Adjust for n->udr changes, resolve UDR clauses
here.
(omp_udr_callback): Don't check for implicitly declared functions
here.
(gfc_resolve_omp_udr): Don't call gfc_resolve. Don't check for
implicitly declared subroutines here.
* resolve.c (resolve_function): If value.function.isym is non-NULL,
consider it already resolved.
(resolve_code): Renamed to ...
(gfc_resolve_code): ... this. No longer static.
(gfc_resolve_blocks, generate_component_assignments, resolve_codes):
Adjust callers.
* trans-openmp.c (gfc_omp_privatize_by_reference): Don't privatize
by reference type (C_PTR) variables.
(gfc_omp_finish_clause): Make sure OMP_CLAUSE_SIZE is non-NULL.
(gfc_trans_omp_udr_expr): Remove.
(gfc_trans_omp_array_reduction_or_udr): Adjust for n->udr changes.
Don't call gfc_trans_omp_udr_expr, even for sym->attr.dimension
expand it as assignment or subroutine call. Don't initialize
value.function.isym.
gcc/testsuite/
* gfortran.dg/gomp/udr2.f90 (f7, f9): Add !$omp parallel with
reduction clause.
* gfortran.dg/gomp/udr4.f90 (f4): Likewise.
Remove Label is never defined expected error.
* gfortran.dg/gomp/udr8.f90: New test.
libgomp/
* testsuite/libgomp.fortran/aligned1.f03: New test.
* testsuite/libgomp.fortran/nestedfn5.f90: New test.
* testsuite/libgomp.fortran/target7.f90: Surround loop spawning
tasks with !$omp parallel !$omp single.
* testsuite/libgomp.fortran/target8.f90: New test.
* testsuite/libgomp.fortran/udr4.f90 (foo UDR, bar UDR): Adjust
not to use trim in the combiner, instead call elemental function.
(fn): New elemental function.
* testsuite/libgomp.fortran/udr6.f90 (do_add, dp_add, dp_init):
Make elemental.
* testsuite/libgomp.fortran/udr7.f90 (omp_priv, omp_orig, omp_out,
omp_in): Likewise.
* testsuite/libgomp.fortran/udr12.f90: New test.
* testsuite/libgomp.fortran/udr13.f90: New test.
* testsuite/libgomp.fortran/udr14.f90: New test.
* testsuite/libgomp.fortran/udr15.f90: New test.
From-SVN: r211929
107 lines
3.2 KiB
Fortran
107 lines
3.2 KiB
Fortran
! { dg-do run }
|
|
|
|
interface
|
|
subroutine sub1 (x, y)
|
|
integer, intent(in) :: y(:)
|
|
integer, intent(out) :: x(:)
|
|
end subroutine
|
|
function fn2 (x, m1, m2, n1, n2)
|
|
integer, intent(in) :: x(:,:), m1, m2, n1, n2
|
|
integer :: fn2(m1:m2,n1:n2)
|
|
end function
|
|
subroutine sub3 (x, y)
|
|
integer, allocatable, intent(in) :: y(:,:)
|
|
integer, allocatable, intent(inout) :: x(:,:)
|
|
end subroutine
|
|
end interface
|
|
!$omp declare reduction (foo : integer : sub3 (omp_out, omp_in)) &
|
|
!$omp initializer (omp_priv = fn3 (omp_orig))
|
|
!$omp declare reduction (bar : integer : omp_out = fn1 (omp_out, omp_in, &
|
|
!$omp & lbound (omp_out, 1), ubound (omp_out, 1))) &
|
|
!$omp & initializer (sub1 (omp_priv, omp_orig))
|
|
!$omp declare reduction (baz : integer : sub2 (omp_out, omp_in)) &
|
|
!$omp initializer (omp_priv = fn2 (omp_orig, lbound (omp_priv, 1), &
|
|
!$omp ubound (omp_priv, 1), lbound (omp_priv, 2), ubound (omp_priv, 2)))
|
|
interface
|
|
function fn1 (x, y, m1, m2)
|
|
integer, intent(in) :: x(:), y(:), m1, m2
|
|
integer :: fn1(m1:m2)
|
|
end function
|
|
subroutine sub2 (x, y)
|
|
integer, intent(in) :: y(:,:)
|
|
integer, intent(inout) :: x(:,:)
|
|
end subroutine
|
|
function fn3 (x)
|
|
integer, allocatable, intent(in) :: x(:,:)
|
|
integer, allocatable :: fn3(:,:)
|
|
end function
|
|
end interface
|
|
integer :: a(10), b(3:5,7:9), r
|
|
integer, allocatable :: c(:,:)
|
|
a(:) = 0
|
|
r = 0
|
|
!$omp parallel reduction (bar : a) reduction (+: r)
|
|
if (lbound (a, 1) /= 1 .or. ubound (a, 1) /= 10) call abort
|
|
a = a + 2
|
|
r = r + 1
|
|
!$omp end parallel
|
|
if (any (a /= 4 * r) ) call abort
|
|
b(:,:) = 0
|
|
allocate (c (4:6,8:10))
|
|
c(:,:) = 0
|
|
r = 0
|
|
!$omp parallel reduction (baz : b, c) reduction (+: r)
|
|
if (lbound (b, 1) /= 3 .or. ubound (b, 1) /= 5) call abort
|
|
if (lbound (b, 2) /= 7 .or. ubound (b, 2) /= 9) call abort
|
|
if (.not. allocated (c)) call abort
|
|
if (lbound (c, 1) /= 4 .or. ubound (c, 1) /= 6) call abort
|
|
if (lbound (c, 2) /= 8 .or. ubound (c, 2) /= 10) call abort
|
|
b = b + 3
|
|
c = c + 4
|
|
r = r + 1
|
|
!$omp end parallel
|
|
if (any (b /= 3 * r) .or. any (c /= 4 * r)) call abort
|
|
deallocate (c)
|
|
allocate (c (0:1,7:11))
|
|
c(:,:) = 0
|
|
r = 0
|
|
!$omp parallel reduction (foo : c) reduction (+: r)
|
|
if (.not. allocated (c)) call abort
|
|
if (lbound (c, 1) /= 0 .or. ubound (c, 1) /= 1) call abort
|
|
if (lbound (c, 2) /= 7 .or. ubound (c, 2) /= 11) call abort
|
|
c = c + 5
|
|
r = r + 1
|
|
!$omp end parallel
|
|
if (any (c /= 10 * r)) call abort
|
|
end
|
|
function fn1 (x, y, m1, m2)
|
|
integer, intent(in) :: x(:), y(:), m1, m2
|
|
integer :: fn1(m1:m2)
|
|
fn1 = x + 2 * y
|
|
end function
|
|
subroutine sub1 (x, y)
|
|
integer, intent(in) :: y(:)
|
|
integer, intent(out) :: x(:)
|
|
x = 0
|
|
end subroutine
|
|
function fn2 (x, m1, m2, n1, n2)
|
|
integer, intent(in) :: x(:,:), m1, m2, n1, n2
|
|
integer :: fn2(m1:m2,n1:n2)
|
|
fn2 = x
|
|
end function
|
|
subroutine sub2 (x, y)
|
|
integer, intent(inout) :: x(:,:)
|
|
integer, intent(in) :: y(:,:)
|
|
x = x + y
|
|
end subroutine
|
|
function fn3 (x)
|
|
integer, allocatable, intent(in) :: x(:,:)
|
|
integer, allocatable :: fn3(:,:)
|
|
fn3 = x
|
|
end function
|
|
subroutine sub3 (x, y)
|
|
integer, allocatable, intent(inout) :: x(:,:)
|
|
integer, allocatable, intent(in) :: y(:,:)
|
|
x = x + 2 * y
|
|
end subroutine
|