gcc/libgomp/testsuite/libgomp.fortran/udr9.f90

66 lines
1.6 KiB
Fortran
Raw Normal View History

dump-parse-tree.c (show_omp_namelist): Dump reduction id in each list item. 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
2014-06-06 09:24:38 +02:00
! { dg-do run }
module udr9m1
integer, parameter :: a = 6
integer :: b
!$omp declare reduction (foo : integer : combiner1 (omp_out, omp_in)) &
!$omp & initializer (initializer1 (omp_priv, omp_orig))
!$omp declare reduction (.add. : integer : &
!$omp & combiner1 (omp_out, omp_in)) &
!$omp & initializer (initializer1 (omp_priv, omp_orig))
interface operator (.add.)
module procedure f1
end interface
contains
integer function f1 (x, y)
integer, intent (in) :: x, y
f1 = x + y
end function f1
elemental subroutine combiner1 (x, y)
integer, intent (inout) :: x
integer, intent (in) :: y
x = x + iand (y, -4)
end subroutine
subroutine initializer1 (x, y)
integer :: x, y
re PR fortran/84381 (replace non-std 'call abort' by 'stop 1' in gfortran testsuite) 2018-03-25 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/84381 * testsuite/libgomp.fortran/aligned1.f03: Replace non-standard call abort by STOP n. * testsuite/libgomp.fortran/alloc-comp-1.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-2.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-3.f90: Likewise. * testsuite/libgomp.fortran/allocatable1.f90: Likewise. * testsuite/libgomp.fortran/allocatable10.f90: Likewise. * testsuite/libgomp.fortran/allocatable11.f90: Likewise. * testsuite/libgomp.fortran/allocatable12.f90: Likewise. * testsuite/libgomp.fortran/allocatable2.f90: Likewise. * testsuite/libgomp.fortran/allocatable3.f90: Likewise. * testsuite/libgomp.fortran/allocatable4.f90: Likewise. * testsuite/libgomp.fortran/allocatable5.f90: Likewise. * testsuite/libgomp.fortran/allocatable6.f90: Likewise. * testsuite/libgomp.fortran/allocatable7.f90: Likewise. * testsuite/libgomp.fortran/allocatable8.f90: Likewise. * testsuite/libgomp.fortran/allocatable9.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.18.1.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.19.1.f90: Likewise. * testsuite/libgomp.fortran/associate1.f90: Likewise. * testsuite/libgomp.fortran/associate2.f90: Likewise. * testsuite/libgomp.fortran/associate3.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-2.f90: Likewise. * testsuite/libgomp.fortran/cancel-parallel-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-sections-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-taskgroup-2.f90: Likewise. * testsuite/libgomp.fortran/character1.f90: Likewise. * testsuite/libgomp.fortran/character2.f90: Likewise. * testsuite/libgomp.fortran/collapse1.f90: Likewise. * testsuite/libgomp.fortran/collapse2.f90: Likewise. * testsuite/libgomp.fortran/collapse3.f90: Likewise. * testsuite/libgomp.fortran/collapse4.f90: Likewise. * testsuite/libgomp.fortran/crayptr1.f90: Likewise. * testsuite/libgomp.fortran/crayptr2.f90: Likewise. * testsuite/libgomp.fortran/crayptr3.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-1.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-3.f90: Likewise. * testsuite/libgomp.fortran/declare-target-2.f90: Likewise. * testsuite/libgomp.fortran/depend-1.f90: Likewise. * testsuite/libgomp.fortran/depend-2.f90: Likewise. * testsuite/libgomp.fortran/depend-3.f90: Likewise. * testsuite/libgomp.fortran/do1.f90: Likewise. * testsuite/libgomp.fortran/do2.f90: Likewise. * testsuite/libgomp.fortran/doacross1.f90: Likewise. * testsuite/libgomp.fortran/doacross2.f90: Likewise. * testsuite/libgomp.fortran/doacross3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-6.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-7.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-8.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-6.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-7.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_update-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_update-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-6.f90: Likewise. * testsuite/libgomp.fortran/lastprivate1.f90: Likewise. * testsuite/libgomp.fortran/lastprivate2.f90: Likewise. * testsuite/libgomp.fortran/lib1.f90: Likewise. * testsuite/libgomp.fortran/lib2.f: Likewise. * testsuite/libgomp.fortran/lib3.f: Likewise. * testsuite/libgomp.fortran/lib4.f90: Likewise. * testsuite/libgomp.fortran/lock-1.f90: Likewise. * testsuite/libgomp.fortran/lock-2.f90: Likewise. * testsuite/libgomp.fortran/nested1.f90: Likewise. * testsuite/libgomp.fortran/nestedfn1.f90: Likewise. * testsuite/libgomp.fortran/nestedfn2.f90: Likewise. * testsuite/libgomp.fortran/nestedfn3.f90: Likewise. * testsuite/libgomp.fortran/nestedfn4.f90: Likewise. * testsuite/libgomp.fortran/nestedfn5.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic1.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic2.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic3.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic4.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic5.f90: Likewise. * testsuite/libgomp.fortran/omp_cond1.f: Likewise. * testsuite/libgomp.fortran/omp_cond2.f: Likewise. * testsuite/libgomp.fortran/omp_cond3.F90: Likewise. * testsuite/libgomp.fortran/omp_cond4.F90: Likewise. * testsuite/libgomp.fortran/omp_parse1.f90: Likewise. * testsuite/libgomp.fortran/omp_parse2.f90: Likewise. * testsuite/libgomp.fortran/omp_parse3.f90: Likewise. * testsuite/libgomp.fortran/omp_parse4.f90: Likewise. * testsuite/libgomp.fortran/openmp_version-1.f: Likewise. * testsuite/libgomp.fortran/openmp_version-2.f90: Likewise. * testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95: Likewise. * testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95: Likewise. * testsuite/libgomp.fortran/pointer1.f90: Likewise. * testsuite/libgomp.fortran/pointer2.f90: Likewise. * testsuite/libgomp.fortran/pr25162.f: Likewise. * testsuite/libgomp.fortran/pr25219.f90: Likewise. * testsuite/libgomp.fortran/pr27395-1.f90: Likewise. * testsuite/libgomp.fortran/pr27395-2.f90: Likewise. * testsuite/libgomp.fortran/pr27416-1.f90: Likewise. * testsuite/libgomp.fortran/pr27916-1.f90: Likewise. * testsuite/libgomp.fortran/pr27916-2.f90: Likewise. * testsuite/libgomp.fortran/pr28390.f: Likewise. * testsuite/libgomp.fortran/pr29629.f90: Likewise. * testsuite/libgomp.fortran/pr32550.f90: Likewise. * testsuite/libgomp.fortran/pr33880.f90: Likewise. * testsuite/libgomp.fortran/pr34020.f90: Likewise. * testsuite/libgomp.fortran/pr35130.f90: Likewise. * testsuite/libgomp.fortran/pr42162.f90: Likewise. * testsuite/libgomp.fortran/pr46753.f90: Likewise. * testsuite/libgomp.fortran/pr48894.f90: Likewise. * testsuite/libgomp.fortran/pr49792-1.f90: Likewise. * testsuite/libgomp.fortran/pr49792-2.f90: Likewise. * testsuite/libgomp.fortran/pr63938-1.f90: Likewise. * testsuite/libgomp.fortran/pr63938-2.f90: Likewise. * testsuite/libgomp.fortran/pr65597.f90: Likewise. * testsuite/libgomp.fortran/pr66199-1.f90: Likewise. * testsuite/libgomp.fortran/pr71014.f90: Likewise. * testsuite/libgomp.fortran/pr81304.f90: Likewise. * testsuite/libgomp.fortran/pr81841.f90: Likewise. * testsuite/libgomp.fortran/pr84418-1.f90: Likewise. * testsuite/libgomp.fortran/pr84418-2.f90: Likewise. * testsuite/libgomp.fortran/procptr1.f90: Likewise. * testsuite/libgomp.fortran/recursion1.f90: Likewise. * testsuite/libgomp.fortran/reduction1.f90: Likewise. * testsuite/libgomp.fortran/reduction2.f90: Likewise. * testsuite/libgomp.fortran/reduction3.f90: Likewise. * testsuite/libgomp.fortran/reduction4.f90: Likewise. * testsuite/libgomp.fortran/reduction5.f90: Likewise. * testsuite/libgomp.fortran/reduction6.f90: Likewise. * testsuite/libgomp.fortran/reference1.f90: Likewise. * testsuite/libgomp.fortran/reference2.f90: Likewise. * testsuite/libgomp.fortran/retval1.f90: Likewise. * testsuite/libgomp.fortran/retval2.f90: Likewise. * testsuite/libgomp.fortran/sharing1.f90: Likewise. * testsuite/libgomp.fortran/sharing2.f90: Likewise. * testsuite/libgomp.fortran/simd1.f90: Likewise. * testsuite/libgomp.fortran/simd2.f90: Likewise. * testsuite/libgomp.fortran/simd3.f90: Likewise. * testsuite/libgomp.fortran/simd4.f90: Likewise. * testsuite/libgomp.fortran/simd5.f90: Likewise. * testsuite/libgomp.fortran/simd6.f90: Likewise. * testsuite/libgomp.fortran/simd7.f90: Likewise. * testsuite/libgomp.fortran/stack.f90: Likewise. * testsuite/libgomp.fortran/strassen.f90: Likewise. * testsuite/libgomp.fortran/tabs1.f90: Likewise. * testsuite/libgomp.fortran/tabs2.f: Likewise. * testsuite/libgomp.fortran/target1.f90: Likewise. * testsuite/libgomp.fortran/target2.f90: Likewise. * testsuite/libgomp.fortran/target3.f90: Likewise. * testsuite/libgomp.fortran/target4.f90: Likewise. * testsuite/libgomp.fortran/target5.f90: Likewise. * testsuite/libgomp.fortran/target6.f90: Likewise. * testsuite/libgomp.fortran/target7.f90: Likewise. * testsuite/libgomp.fortran/target8.f90: Likewise. * testsuite/libgomp.fortran/task1.f90: Likewise. * testsuite/libgomp.fortran/task2.f90: Likewise. * testsuite/libgomp.fortran/task3.f90: Likewise. * testsuite/libgomp.fortran/task4.f90: Likewise. * testsuite/libgomp.fortran/taskgroup1.f90: Likewise. * testsuite/libgomp.fortran/taskloop1.f90: Likewise. * testsuite/libgomp.fortran/taskloop2.f90: Likewise. * testsuite/libgomp.fortran/taskloop3.f90: Likewise. * testsuite/libgomp.fortran/taskloop4.f90: Likewise. * testsuite/libgomp.fortran/threadprivate1.f90: Likewise. * testsuite/libgomp.fortran/threadprivate2.f90: Likewise. * testsuite/libgomp.fortran/threadprivate3.f90: Likewise. * testsuite/libgomp.fortran/threadprivate4.f90: Likewise. * testsuite/libgomp.fortran/udr1.f90: Likewise. * testsuite/libgomp.fortran/udr10.f90: Likewise. * testsuite/libgomp.fortran/udr11.f90: Likewise. * testsuite/libgomp.fortran/udr12.f90: Likewise. * testsuite/libgomp.fortran/udr13.f90: Likewise. * testsuite/libgomp.fortran/udr14.f90: Likewise. * testsuite/libgomp.fortran/udr15.f90: Likewise. * testsuite/libgomp.fortran/udr2.f90: Likewise. * testsuite/libgomp.fortran/udr3.f90: Likewise. * testsuite/libgomp.fortran/udr4.f90: Likewise. * testsuite/libgomp.fortran/udr5.f90: Likewise. * testsuite/libgomp.fortran/udr6.f90: Likewise. * testsuite/libgomp.fortran/udr7.f90: Likewise. * testsuite/libgomp.fortran/udr8.f90: Likewise. * testsuite/libgomp.fortran/udr9.f90: Likewise. * testsuite/libgomp.fortran/vla1.f90: Likewise. * testsuite/libgomp.fortran/vla2.f90: Likewise. * testsuite/libgomp.fortran/vla3.f90: Likewise. * testsuite/libgomp.fortran/vla4.f90: Likewise. * testsuite/libgomp.fortran/vla5.f90: Likewise. * testsuite/libgomp.fortran/vla6.f90: Likewise. * testsuite/libgomp.fortran/vla7.f90: Likewise. * testsuite/libgomp.fortran/vla8.f90: Likewise. * testsuite/libgomp.fortran/workshare1.f90: Likewise. * testsuite/libgomp.fortran/workshare2.f90: Likewise. * testsuite/libgomp.oacc-fortran/abort-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/abort-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_capture-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_rw-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_update-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/c2.pl: Likewise. * testsuite/libgomp.oacc-fortran/clauses-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/combined-directives-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/combined-reduction.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-4-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/default-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/firstprivate-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/gang-static-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/host_data-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/if-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop.f95: Likewise. * testsuite/libgomp.oacc-fortran/lib-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-10.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-2.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-3.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-32-1.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-32-2.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/map-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/non-scalar-data.f90: Likewise. * testsuite/libgomp.oacc-fortran/openacc_version-1.f: Likewise. * testsuite/libgomp.oacc-fortran/openacc_version-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/par-reduction-2-1.f: Likewise. * testsuite/libgomp.oacc-fortran/par-reduction-2-2.f: Likewise. * testsuite/libgomp.oacc-fortran/parallel-reduction.f90: Likewise. * testsuite/libgomp.oacc-fortran/pointer-align-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr70643.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr81352.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr83920.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr84028.f90: Likewise. * testsuite/libgomp.oacc-fortran/private-variables.f90: Likewise. * testsuite/libgomp.oacc-fortran/pset-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-9.f90: Likewise. * testsuite/libgomp.oacc-fortran/subarrays-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/subarrays-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/update-1.f90: Likewise. From-SVN: r258846
2018-03-25 18:00:52 +02:00
if (y .ne. 3) STOP 1
dump-parse-tree.c (show_omp_namelist): Dump reduction id in each list item. 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
2014-06-06 09:24:38 +02:00
x = y
end subroutine
end module udr9m1
module udr9m2
use udr9m1
type dt
integer :: x
end type
!$omp declare reduction (+ : dt : combiner2 (omp_in, omp_out)) &
!$omp & initializer (initializer2 (omp_priv))
interface operator (+)
module procedure f2
end interface
contains
type(dt) function f2 (x, y)
type(dt), intent (in) :: x, y
f2%x = x%x + y%x
end function f2
subroutine combiner2 (x, y)
type(dt) :: x, y
y = y + x
end subroutine combiner2
subroutine initializer2 (x)
type(dt), intent(out) :: x
x%x = 0
end subroutine initializer2
end module udr9m2
use udr9m2
integer :: i, j
type(dt) :: d
j = 3
d%x = 0
!$omp parallel do reduction (.add.: j) reduction (+ : d)
do i = 1, 100
j = j.add.iand (i, -4)
d = d + dt(i)
end do
re PR fortran/84381 (replace non-std 'call abort' by 'stop 1' in gfortran testsuite) 2018-03-25 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/84381 * testsuite/libgomp.fortran/aligned1.f03: Replace non-standard call abort by STOP n. * testsuite/libgomp.fortran/alloc-comp-1.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-2.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-3.f90: Likewise. * testsuite/libgomp.fortran/allocatable1.f90: Likewise. * testsuite/libgomp.fortran/allocatable10.f90: Likewise. * testsuite/libgomp.fortran/allocatable11.f90: Likewise. * testsuite/libgomp.fortran/allocatable12.f90: Likewise. * testsuite/libgomp.fortran/allocatable2.f90: Likewise. * testsuite/libgomp.fortran/allocatable3.f90: Likewise. * testsuite/libgomp.fortran/allocatable4.f90: Likewise. * testsuite/libgomp.fortran/allocatable5.f90: Likewise. * testsuite/libgomp.fortran/allocatable6.f90: Likewise. * testsuite/libgomp.fortran/allocatable7.f90: Likewise. * testsuite/libgomp.fortran/allocatable8.f90: Likewise. * testsuite/libgomp.fortran/allocatable9.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.18.1.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.19.1.f90: Likewise. * testsuite/libgomp.fortran/associate1.f90: Likewise. * testsuite/libgomp.fortran/associate2.f90: Likewise. * testsuite/libgomp.fortran/associate3.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-2.f90: Likewise. * testsuite/libgomp.fortran/cancel-parallel-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-sections-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-taskgroup-2.f90: Likewise. * testsuite/libgomp.fortran/character1.f90: Likewise. * testsuite/libgomp.fortran/character2.f90: Likewise. * testsuite/libgomp.fortran/collapse1.f90: Likewise. * testsuite/libgomp.fortran/collapse2.f90: Likewise. * testsuite/libgomp.fortran/collapse3.f90: Likewise. * testsuite/libgomp.fortran/collapse4.f90: Likewise. * testsuite/libgomp.fortran/crayptr1.f90: Likewise. * testsuite/libgomp.fortran/crayptr2.f90: Likewise. * testsuite/libgomp.fortran/crayptr3.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-1.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-3.f90: Likewise. * testsuite/libgomp.fortran/declare-target-2.f90: Likewise. * testsuite/libgomp.fortran/depend-1.f90: Likewise. * testsuite/libgomp.fortran/depend-2.f90: Likewise. * testsuite/libgomp.fortran/depend-3.f90: Likewise. * testsuite/libgomp.fortran/do1.f90: Likewise. * testsuite/libgomp.fortran/do2.f90: Likewise. * testsuite/libgomp.fortran/doacross1.f90: Likewise. * testsuite/libgomp.fortran/doacross2.f90: Likewise. * testsuite/libgomp.fortran/doacross3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-6.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-7.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-8.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-6.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_data-7.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_update-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target_update-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/task_dep-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/teams-6.f90: Likewise. * testsuite/libgomp.fortran/lastprivate1.f90: Likewise. * testsuite/libgomp.fortran/lastprivate2.f90: Likewise. * testsuite/libgomp.fortran/lib1.f90: Likewise. * testsuite/libgomp.fortran/lib2.f: Likewise. * testsuite/libgomp.fortran/lib3.f: Likewise. * testsuite/libgomp.fortran/lib4.f90: Likewise. * testsuite/libgomp.fortran/lock-1.f90: Likewise. * testsuite/libgomp.fortran/lock-2.f90: Likewise. * testsuite/libgomp.fortran/nested1.f90: Likewise. * testsuite/libgomp.fortran/nestedfn1.f90: Likewise. * testsuite/libgomp.fortran/nestedfn2.f90: Likewise. * testsuite/libgomp.fortran/nestedfn3.f90: Likewise. * testsuite/libgomp.fortran/nestedfn4.f90: Likewise. * testsuite/libgomp.fortran/nestedfn5.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic1.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic2.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic3.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic4.f90: Likewise. * testsuite/libgomp.fortran/omp_atomic5.f90: Likewise. * testsuite/libgomp.fortran/omp_cond1.f: Likewise. * testsuite/libgomp.fortran/omp_cond2.f: Likewise. * testsuite/libgomp.fortran/omp_cond3.F90: Likewise. * testsuite/libgomp.fortran/omp_cond4.F90: Likewise. * testsuite/libgomp.fortran/omp_parse1.f90: Likewise. * testsuite/libgomp.fortran/omp_parse2.f90: Likewise. * testsuite/libgomp.fortran/omp_parse3.f90: Likewise. * testsuite/libgomp.fortran/omp_parse4.f90: Likewise. * testsuite/libgomp.fortran/openmp_version-1.f: Likewise. * testsuite/libgomp.fortran/openmp_version-2.f90: Likewise. * testsuite/libgomp.fortran/parloops-exit-first-loop-alt-2.f95: Likewise. * testsuite/libgomp.fortran/parloops-exit-first-loop-alt.f95: Likewise. * testsuite/libgomp.fortran/pointer1.f90: Likewise. * testsuite/libgomp.fortran/pointer2.f90: Likewise. * testsuite/libgomp.fortran/pr25162.f: Likewise. * testsuite/libgomp.fortran/pr25219.f90: Likewise. * testsuite/libgomp.fortran/pr27395-1.f90: Likewise. * testsuite/libgomp.fortran/pr27395-2.f90: Likewise. * testsuite/libgomp.fortran/pr27416-1.f90: Likewise. * testsuite/libgomp.fortran/pr27916-1.f90: Likewise. * testsuite/libgomp.fortran/pr27916-2.f90: Likewise. * testsuite/libgomp.fortran/pr28390.f: Likewise. * testsuite/libgomp.fortran/pr29629.f90: Likewise. * testsuite/libgomp.fortran/pr32550.f90: Likewise. * testsuite/libgomp.fortran/pr33880.f90: Likewise. * testsuite/libgomp.fortran/pr34020.f90: Likewise. * testsuite/libgomp.fortran/pr35130.f90: Likewise. * testsuite/libgomp.fortran/pr42162.f90: Likewise. * testsuite/libgomp.fortran/pr46753.f90: Likewise. * testsuite/libgomp.fortran/pr48894.f90: Likewise. * testsuite/libgomp.fortran/pr49792-1.f90: Likewise. * testsuite/libgomp.fortran/pr49792-2.f90: Likewise. * testsuite/libgomp.fortran/pr63938-1.f90: Likewise. * testsuite/libgomp.fortran/pr63938-2.f90: Likewise. * testsuite/libgomp.fortran/pr65597.f90: Likewise. * testsuite/libgomp.fortran/pr66199-1.f90: Likewise. * testsuite/libgomp.fortran/pr71014.f90: Likewise. * testsuite/libgomp.fortran/pr81304.f90: Likewise. * testsuite/libgomp.fortran/pr81841.f90: Likewise. * testsuite/libgomp.fortran/pr84418-1.f90: Likewise. * testsuite/libgomp.fortran/pr84418-2.f90: Likewise. * testsuite/libgomp.fortran/procptr1.f90: Likewise. * testsuite/libgomp.fortran/recursion1.f90: Likewise. * testsuite/libgomp.fortran/reduction1.f90: Likewise. * testsuite/libgomp.fortran/reduction2.f90: Likewise. * testsuite/libgomp.fortran/reduction3.f90: Likewise. * testsuite/libgomp.fortran/reduction4.f90: Likewise. * testsuite/libgomp.fortran/reduction5.f90: Likewise. * testsuite/libgomp.fortran/reduction6.f90: Likewise. * testsuite/libgomp.fortran/reference1.f90: Likewise. * testsuite/libgomp.fortran/reference2.f90: Likewise. * testsuite/libgomp.fortran/retval1.f90: Likewise. * testsuite/libgomp.fortran/retval2.f90: Likewise. * testsuite/libgomp.fortran/sharing1.f90: Likewise. * testsuite/libgomp.fortran/sharing2.f90: Likewise. * testsuite/libgomp.fortran/simd1.f90: Likewise. * testsuite/libgomp.fortran/simd2.f90: Likewise. * testsuite/libgomp.fortran/simd3.f90: Likewise. * testsuite/libgomp.fortran/simd4.f90: Likewise. * testsuite/libgomp.fortran/simd5.f90: Likewise. * testsuite/libgomp.fortran/simd6.f90: Likewise. * testsuite/libgomp.fortran/simd7.f90: Likewise. * testsuite/libgomp.fortran/stack.f90: Likewise. * testsuite/libgomp.fortran/strassen.f90: Likewise. * testsuite/libgomp.fortran/tabs1.f90: Likewise. * testsuite/libgomp.fortran/tabs2.f: Likewise. * testsuite/libgomp.fortran/target1.f90: Likewise. * testsuite/libgomp.fortran/target2.f90: Likewise. * testsuite/libgomp.fortran/target3.f90: Likewise. * testsuite/libgomp.fortran/target4.f90: Likewise. * testsuite/libgomp.fortran/target5.f90: Likewise. * testsuite/libgomp.fortran/target6.f90: Likewise. * testsuite/libgomp.fortran/target7.f90: Likewise. * testsuite/libgomp.fortran/target8.f90: Likewise. * testsuite/libgomp.fortran/task1.f90: Likewise. * testsuite/libgomp.fortran/task2.f90: Likewise. * testsuite/libgomp.fortran/task3.f90: Likewise. * testsuite/libgomp.fortran/task4.f90: Likewise. * testsuite/libgomp.fortran/taskgroup1.f90: Likewise. * testsuite/libgomp.fortran/taskloop1.f90: Likewise. * testsuite/libgomp.fortran/taskloop2.f90: Likewise. * testsuite/libgomp.fortran/taskloop3.f90: Likewise. * testsuite/libgomp.fortran/taskloop4.f90: Likewise. * testsuite/libgomp.fortran/threadprivate1.f90: Likewise. * testsuite/libgomp.fortran/threadprivate2.f90: Likewise. * testsuite/libgomp.fortran/threadprivate3.f90: Likewise. * testsuite/libgomp.fortran/threadprivate4.f90: Likewise. * testsuite/libgomp.fortran/udr1.f90: Likewise. * testsuite/libgomp.fortran/udr10.f90: Likewise. * testsuite/libgomp.fortran/udr11.f90: Likewise. * testsuite/libgomp.fortran/udr12.f90: Likewise. * testsuite/libgomp.fortran/udr13.f90: Likewise. * testsuite/libgomp.fortran/udr14.f90: Likewise. * testsuite/libgomp.fortran/udr15.f90: Likewise. * testsuite/libgomp.fortran/udr2.f90: Likewise. * testsuite/libgomp.fortran/udr3.f90: Likewise. * testsuite/libgomp.fortran/udr4.f90: Likewise. * testsuite/libgomp.fortran/udr5.f90: Likewise. * testsuite/libgomp.fortran/udr6.f90: Likewise. * testsuite/libgomp.fortran/udr7.f90: Likewise. * testsuite/libgomp.fortran/udr8.f90: Likewise. * testsuite/libgomp.fortran/udr9.f90: Likewise. * testsuite/libgomp.fortran/vla1.f90: Likewise. * testsuite/libgomp.fortran/vla2.f90: Likewise. * testsuite/libgomp.fortran/vla3.f90: Likewise. * testsuite/libgomp.fortran/vla4.f90: Likewise. * testsuite/libgomp.fortran/vla5.f90: Likewise. * testsuite/libgomp.fortran/vla6.f90: Likewise. * testsuite/libgomp.fortran/vla7.f90: Likewise. * testsuite/libgomp.fortran/vla8.f90: Likewise. * testsuite/libgomp.fortran/workshare1.f90: Likewise. * testsuite/libgomp.fortran/workshare2.f90: Likewise. * testsuite/libgomp.oacc-fortran/abort-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/abort-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-2.f: Likewise. * testsuite/libgomp.oacc-fortran/acc_on_device-1-3.f: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/asyncwait-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_capture-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_rw-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/atomic_update-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/c2.pl: Likewise. * testsuite/libgomp.oacc-fortran/clauses-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/collapse-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/combined-directives-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/combined-reduction.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-4-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/data-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/default-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/firstprivate-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/gang-static-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/host_data-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/if-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/implicit-firstprivate-ref.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop-data.f95: Likewise. * testsuite/libgomp.oacc-fortran/kernels-loop.f95: Likewise. * testsuite/libgomp.oacc-fortran/lib-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-10.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-2.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-3.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-32-1.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-32-2.f: Likewise. * testsuite/libgomp.oacc-fortran/lib-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/lib-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/map-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/nested-function-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/non-scalar-data.f90: Likewise. * testsuite/libgomp.oacc-fortran/openacc_version-1.f: Likewise. * testsuite/libgomp.oacc-fortran/openacc_version-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/par-reduction-2-1.f: Likewise. * testsuite/libgomp.oacc-fortran/par-reduction-2-2.f: Likewise. * testsuite/libgomp.oacc-fortran/parallel-reduction.f90: Likewise. * testsuite/libgomp.oacc-fortran/pointer-align-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr70643.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr81352.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr83920.f90: Likewise. * testsuite/libgomp.oacc-fortran/pr84028.f90: Likewise. * testsuite/libgomp.oacc-fortran/private-variables.f90: Likewise. * testsuite/libgomp.oacc-fortran/pset-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/reduction-8.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-9.f90: Likewise. * testsuite/libgomp.oacc-fortran/subarrays-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/subarrays-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/update-1.f90: Likewise. From-SVN: r258846
2018-03-25 18:00:52 +02:00
if (d%x /= 5050 .or. j /= 4903) STOP 2
dump-parse-tree.c (show_omp_namelist): Dump reduction id in each list item. 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
2014-06-06 09:24:38 +02:00
end