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
51 lines
1.9 KiB
Fortran
51 lines
1.9 KiB
Fortran
! { dg-do run }
|
|
|
|
!$omp declare reduction (foo : character(kind=1, len=*) &
|
|
!$omp & : omp_out = fn (omp_out, omp_in)) initializer (omp_priv = '')
|
|
!$omp declare reduction (bar : character(kind=1, len=:) &
|
|
!$omp & : omp_out = fn (omp_in, omp_out)) initializer (omp_priv = '')
|
|
!$omp declare reduction (baz : character(kind=1, len=1) &
|
|
!$omp & : omp_out = char (ichar (omp_out) + ichar (omp_in) &
|
|
!$omp & - ichar ('0'))) initializer (omp_priv = '0')
|
|
!$omp declare reduction (baz : character(kind=1, len=2) &
|
|
!$omp & : omp_out = char (ichar (omp_out(1:1)) + ichar (omp_in(1:1)) &
|
|
!$omp & - ichar ('0')) // char (ichar (omp_out(2:2)) + &
|
|
!$omp & ichar (omp_in(2:2)) - ichar ('0'))) initializer (omp_priv = '00')
|
|
interface
|
|
elemental function fn (x, y)
|
|
character (len=64), intent (in) :: x, y
|
|
character (len=64) :: fn
|
|
end function
|
|
end interface
|
|
character(kind=1, len=64) :: c(-3:-2,1:1,7:8), d(2:3,-7:-5)
|
|
character(kind = 1, len=1) :: e(2:4)
|
|
character(kind = 1, len=1+1) :: f(8:10,9:10)
|
|
integer :: i, j, k
|
|
c = ''
|
|
d = ''
|
|
e = '0'
|
|
f = '00'
|
|
!$omp parallel do reduction (foo : c) reduction (bar : d) &
|
|
!$omp & reduction (baz : e, f) private (j, k)
|
|
do i = 1, 64
|
|
forall (j = -3:-2, k = 7:8) &
|
|
c(j,1,k) = trim(c(j,1,k)) // char (ichar ('0') + i)
|
|
d = char (ichar ('0') + i) // d
|
|
e = char (ichar (e) + mod (i, 3))
|
|
f = char (ichar (f(:,:)(1:1)) + mod (i, 2)) &
|
|
& // char (ichar (f(:,:)(2:2)) + mod (i, 3))
|
|
end do
|
|
do i = 1, 64
|
|
if (any (index (c, char (ichar ('0') + i)) .eq. 0)) call abort
|
|
if (any (index (d, char (ichar ('0') + i)) .eq. 0)) call abort
|
|
end do
|
|
if (any (e.ne.char (ichar ('0') + 64))) call abort
|
|
if (any (f(:,:)(1:1).ne.char (ichar ('0') + 32))) call abort
|
|
if (any (f(:,:)(2:2).ne.char (ichar ('0') + 64))) call abort
|
|
end
|
|
elemental function fn (x, y)
|
|
character (len=64), intent (in) :: x, y
|
|
character (len=64) :: fn
|
|
fn = trim(x) // y
|
|
end function
|