5f23671d3f
gcc/fortran/ * dump-parse-tree.c (show_omp_namelist): Dump reduction id in each list item. (show_omp_node): Only handle OMP_LIST_REDUCTION, not OMP_LIST_REDUCTION_FIRST .. OMP_LIST_REDUCTION_LAST. Don't dump reduction id here. * frontend-passes.c (dummy_code_callback): Renamed to... (gfc_dummy_code_callback): ... this. No longer static. (optimize_reduction): Use gfc_dummy_code_callback instead of dummy_code_callback. * gfortran.h (gfc_statement): Add ST_OMP_DECLARE_REDUCTION. (symbol_attribute): Add omp_udr_artificial_var bitfield. (gfc_omp_reduction_op): New enum. (gfc_omp_namelist): Add rop and udr fields. (OMP_LIST_PLUS, OMP_LIST_REDUCTION_FIRST, OMP_LIST_MULT, OMP_LIST_SUB, OMP_LIST_AND, OMP_LIST_OR, OMP_LIST_EQV, OMP_LIST_NEQV, OMP_LIST_MAX, OMP_LIST_MIN, OMP_LIST_IAND, OMP_LIST_IOR, OMP_LIST_IEOR, OMP_LIST_REDUCTION_LAST): Removed. (OMP_LIST_REDUCTION): New. (gfc_omp_udr): New type. (gfc_get_omp_udr): Define. (gfc_symtree): Add n.omp_udr field. (gfc_namespace): Add omp_udr_root field, add omp_udr_ns bitfield. (gfc_free_omp_udr, gfc_omp_udr_find, gfc_resolve_omp_udrs, gfc_dummy_code_callback): New prototypes. * match.h (gfc_match_omp_declare_reduction): New prototype. * module.c (MOD_VERSION): Increase to 13. (omp_declare_reduction_stmt): New array. (mio_omp_udr_expr, write_omp_udr, write_omp_udrs, load_omp_udrs): New functions. (read_module): Read OpenMP user defined reductions. (write_module): Write OpenMP user defined reductions. * openmp.c: Include arith.h. (gfc_free_omp_udr, gfc_find_omp_udr): New functions. (gfc_match_omp_clauses): Handle user defined reductions. Store reduction kind into gfc_omp_namelist instead of using several OMP_LIST_* entries. (match_udr_expr, gfc_omp_udr_predef, gfc_omp_udr_find, gfc_match_omp_declare_reduction): New functions. (resolve_omp_clauses): Adjust for reduction clauses being only in OMP_LIST_REDUCTION list. Diagnose missing UDRs. (struct omp_udr_callback_data): New type. (omp_udr_callback, gfc_resolve_omp_udr, gfc_resolve_omp_udrs): New functions. * parse.c (decode_omp_directive): Handle !$omp declare reduction. (case_decl): Add ST_OMP_DECLARE_REDUCTION. (gfc_ascii_statement): Print ST_OMP_DECLARE_REDUCTION. * resolve.c (resolve_fl_variable): Allow len=: or len=* on sym->attr.omp_udr_artificial_var symbols. (resolve_types): Call gfc_resolve_omp_udrs. * symbol.c (gfc_get_uop): If gfc_current_ns->omp_udr_ns, use parent ns instead of gfc_current_ns. (gfc_get_sym_tree): Don't insert symbols into namespaces with omp_udr_ns set. (free_omp_udr_tree): New function. (gfc_free_namespace): Call it. * trans-openmp.c (struct omp_udr_find_orig_data): New type. (omp_udr_find_orig, gfc_trans_omp_udr_expr): New functions. (gfc_trans_omp_array_reduction): Renamed to... (gfc_trans_omp_array_reduction_or_udr): ... this. Remove SYM argument, instead pass gfc_omp_namelist pointer N. Handle user defined reductions. (gfc_trans_omp_reduction_list): Remove REDUCTION_CODE argument. Handle user defined reductions and reduction ops in gfc_omp_namelist. (gfc_trans_omp_clauses): Adjust for just a single OMP_LIST_REDUCTION list. (gfc_split_omp_clauses): Likewise. gcc/testsuite/ * gfortran.dg/gomp/allocatable_components_1.f90: Adjust for reduction clause diagnostic changes. * gfortran.dg/gomp/appendix-a/a.31.3.f90: Likewise. * gfortran.dg/gomp/reduction1.f90: Likewise. * gfortran.dg/gomp/reduction3.f90: Likewise. * gfortran.dg/gomp/udr1.f90: New test. * gfortran.dg/gomp/udr2.f90: New test. * gfortran.dg/gomp/udr3.f90: New test. * gfortran.dg/gomp/udr4.f90: New test. * gfortran.dg/gomp/udr5.f90: New test. * gfortran.dg/gomp/udr6.f90: New test. * gfortran.dg/gomp/udr7.f90: New test. libgomp/ * testsuite/libgomp.fortran/simd1.f90: New test. * testsuite/libgomp.fortran/udr1.f90: New test. * testsuite/libgomp.fortran/udr2.f90: New test. * testsuite/libgomp.fortran/udr3.f90: New test. * testsuite/libgomp.fortran/udr4.f90: New test. * testsuite/libgomp.fortran/udr5.f90: New test. * testsuite/libgomp.fortran/udr6.f90: New test. * testsuite/libgomp.fortran/udr7.f90: New test. * testsuite/libgomp.fortran/udr8.f90: New test. * testsuite/libgomp.fortran/udr9.f90: New test. * testsuite/libgomp.fortran/udr10.f90: New test. * testsuite/libgomp.fortran/udr11.f90: New test. From-SVN: r211303
96 lines
2.9 KiB
Fortran
96 lines
2.9 KiB
Fortran
! { dg-do run }
|
|
|
|
module udr11
|
|
type dt
|
|
integer :: x = 0
|
|
end type
|
|
end module udr11
|
|
use udr11, only : dt
|
|
!$omp declare reduction(+:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(-:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(*:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(.and.:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(.or.:dt:omp_out%x=omp_out%x+3*omp_in%x)
|
|
!$omp declare reduction(.eqv.:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(.neqv.:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(min:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(max:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(iand:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(ior:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
!$omp declare reduction(ieor:dt:omp_out%x=omp_out%x+omp_in%x)
|
|
interface operator(.and.)
|
|
function addme1 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme1
|
|
end function addme1
|
|
end interface
|
|
interface operator(.or.)
|
|
function addme2 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme2
|
|
end function addme2
|
|
end interface
|
|
interface operator(.eqv.)
|
|
function addme3 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme3
|
|
end function addme3
|
|
end interface
|
|
interface operator(.neqv.)
|
|
function addme4 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme4
|
|
end function addme4
|
|
end interface
|
|
interface operator(+)
|
|
function addme5 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme5
|
|
end function addme5
|
|
end interface
|
|
interface operator(-)
|
|
function addme6 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme6
|
|
end function addme6
|
|
end interface
|
|
interface operator(*)
|
|
function addme7 (x, y)
|
|
use udr11, only : dt
|
|
type (dt), intent (in) :: x, y
|
|
type(dt) :: addme7
|
|
end function addme7
|
|
end interface
|
|
type(dt) :: j, k, l, m, n, o, p, q, r, s, t, u
|
|
integer :: i
|
|
!$omp parallel do reduction(.and.:j) reduction(.or.:k) &
|
|
!$omp & reduction(.eqv.:l) reduction(.neqv.:m) &
|
|
!$omp & reduction(min:n) reduction(max:o) &
|
|
!$omp & reduction(iand:p) reduction(ior:q) reduction (ieor:r) &
|
|
!$omp & reduction(+:s) reduction(-:t) reduction(*:u)
|
|
do i = 1, 100
|
|
j%x = j%x + i
|
|
k%x = k%x + 2 * i
|
|
l%x = l%x + 3 * i
|
|
m%x = m%x + i
|
|
n%x = n%x + 2 * i
|
|
o%x = o%x + 3 * i
|
|
p%x = p%x + i
|
|
q%x = q%x + 2 * i
|
|
r%x = r%x + 3 * i
|
|
s%x = s%x + i
|
|
t%x = t%x + 2 * i
|
|
u%x = u%x + 3 * i
|
|
end do
|
|
if (j%x /= 5050 .or. k%x /= 30300 .or. l%x /= 15150) call abort
|
|
if (m%x /= 5050 .or. n%x /= 10100 .or. o%x /= 15150) call abort
|
|
if (p%x /= 5050 .or. q%x /= 10100 .or. r%x /= 15150) call abort
|
|
if (s%x /= 5050 .or. t%x /= 10100 .or. u%x /= 15150) call abort
|
|
end
|