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
97 lines
2.3 KiB
Fortran
97 lines
2.3 KiB
Fortran
! { dg-do run }
|
|
|
|
interface
|
|
subroutine bar (q)
|
|
integer :: q(19:)
|
|
end subroutine
|
|
end interface
|
|
integer :: q(7:15)
|
|
q(:) = 5
|
|
call bar (q)
|
|
end
|
|
subroutine bar (q)
|
|
use iso_c_binding, only: c_ptr, c_loc, c_int
|
|
integer :: a, b, c, d(2:3,4:5), q(19:), h, k, m, n, o, p
|
|
integer(c_int), target :: e(64)
|
|
type (c_ptr) :: f, g(64)
|
|
logical :: l
|
|
a = 1
|
|
b = 2
|
|
c = 3
|
|
d = 4
|
|
l = .false.
|
|
f = c_loc (e)
|
|
call foo
|
|
contains
|
|
subroutine foo
|
|
use iso_c_binding, only: c_sizeof
|
|
!$omp simd linear(a:2) linear(b:1)
|
|
do a = 1, 20, 2
|
|
b = b + 1
|
|
end do
|
|
!$omp end simd
|
|
if (a /= 21 .or. b /= 12) call abort
|
|
!$omp simd aligned(f : c_sizeof (e(1)))
|
|
do b = 1, 64
|
|
g(b) = f
|
|
end do
|
|
!$omp end simd
|
|
!$omp parallel
|
|
!$omp single
|
|
!$omp taskgroup
|
|
!$omp task depend(out : a, d(2:2,4:5))
|
|
a = a + 1
|
|
d(2:2,4:5) = d(2:2,4:5) + 1
|
|
!$omp end task
|
|
!$omp task depend(in : a, d(2:2,4:5))
|
|
if (a /= 22) call abort
|
|
if (any (d(2:2,4:5) /= 5)) call abort
|
|
!$omp end task
|
|
!$omp end taskgroup
|
|
!$omp end single
|
|
!$omp end parallel
|
|
b = 10
|
|
!$omp target data map (tofrom: a, d(2:3,4:4), q) map (from: l)
|
|
!$omp target map (tofrom: b, d(2:3,4:4))
|
|
l = .false.
|
|
if (a /= 22 .or. any (q /= 5)) l = .true.
|
|
if (lbound (q, 1) /= 19 .or. ubound (q, 1) /= 27) l = .true.
|
|
if (d(2,4) /= 5 .or. d(3,4) /= 4) l = .true.
|
|
l = l .or. (b /= 10)
|
|
a = 6
|
|
b = 11
|
|
q = 8
|
|
d(2:3,4:4) = 9
|
|
!$omp end target
|
|
!$omp target update from (a, q, d(2:3,4:4), l)
|
|
if (a /= 6 .or. l .or. b /= 11 .or. any (q /= 8)) call abort
|
|
if (any (d(2:3,4:4) /= 9) .or. d(2,5) /= 5 .or. d(3,5) /= 4) call abort
|
|
a = 12
|
|
b = 13
|
|
q = 14
|
|
d = 15
|
|
!$omp target update to (a, q, d(2:3,4:4))
|
|
!$omp target map (tofrom: b, d(2:3,4:4))
|
|
if (a /= 12 .or. b /= 13 .or. any (q /= 14)) l = .true.
|
|
l = l .or. any (d(2:3,4:4) /= 15)
|
|
!$omp end target
|
|
a = 0
|
|
b = 1
|
|
c = 100
|
|
h = 8
|
|
m = 0
|
|
n = 64
|
|
o = 16
|
|
if (l) call abort
|
|
!$omp target teams distribute parallel do simd if (.not.l) device(a) &
|
|
!$omp & num_teams(b) dist_schedule(static, c) num_threads (h) &
|
|
!$omp & reduction (+: m) safelen (n) schedule(static, o)
|
|
do p = 1, 64
|
|
m = m + 1
|
|
end do
|
|
!$omp end target teams distribute parallel do simd
|
|
if (m /= 64) call abort
|
|
!$omp end target data
|
|
end subroutine foo
|
|
end subroutine bar
|