gcc/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90

72 lines
1.8 KiB
Fortran
Raw Permalink Normal View History

[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
! Exercise nested function decomposition, gcc/tree-nested.c.
! { dg-do run }
! { dg-options "-std=legacy" }
[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
program collapse2
call test1
call test2
contains
subroutine test1
integer :: i, j, k, a(1:3, 4:6, 5:7)
logical :: l
l = .false.
a(:, :, :) = 0
!$acc parallel reduction (.or.:l)
!$acc loop worker vector collapse(4 - 1)
do 164 i = 1, 3
do 164 j = 4, 6
do 164 k = 5, 7
a(i, j, k) = i + j + k
164 end do
!$acc loop worker vector reduction(.or.:l) collapse(2)
firstdo: do i = 1, 3
do j = 4, 6
do k = 5, 7
if (a(i, j, k) .ne. (i + j + k)) l = .true.
end do
end do
end do firstdo
!$acc end parallel
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 16:00:52 +00:00
if (l) STOP 1
[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
end subroutine test1
subroutine test2
integer :: a(3,3,3), k, kk, kkk, l, ll, lll
a = 0
gimplify.c (gimplify_scan_omp_clauses): No special handling for OMP_CLAUSE_TILE. 2017-02-09 Nathan Sidwell <nathan@codesourcery.com> Cesar Philippidis <cesar@codesourcery.com> Joseph Myers <joseph@codesourcery.com> Chung-Lin Tang <cltang@codesourcery.com> gcc/ * gimplify.c (gimplify_scan_omp_clauses): No special handling for OMP_CLAUSE_TILE. (gimplify_adjust_omp_clauses): Don't delete TILE. (gimplify_omp_for): Deal with TILE. * internal-fn.c (expand_GOACC_TILE): New function. * internal-fn.def (GOACC_DIM_POS): Comment may be overly conservative. (GOACC_TILE): New. * omp-expand.c (struct oacc_collapse): Add tile and outer fields. (expand_oacc_collapse_init): Add LOC paramter. Initialize tile element fields. (expand_oacc_collapse_vars): Add INNER parm, adjust for tiling, avoid DIV for outermost collapse var. (expand_oacc_for): Insert tile element loop as needed. Adjust. Remove out of date comments, fix whitespace. * omp-general.c (omp_extract_for_data): Deal with tiling. * omp-general.h (enum oacc_loop_flags): Add OLF_TILE flag, adjust OLF_DIM_BASE value. (struct omp_for_data): Add tiling field. * omp-low.c (scan_sharing_clauses): Allow OMP_CLAUSE_TILE. (lower_oacc_head_mark): Add OLF_TILE as appropriate. Ensure 2 levels for auto loops. Remove default auto determining, moved to oacc_loop_fixed_partitions. * omp-offload.c (struct oacc_loop): Change 'ifns' to vector of call stmts, add e_mask field. (oacc_dim_call): New function, abstracted out from oacc_thread_numbers. (oacc_thread_numbers): Use oacc_dim_call. (oacc_xform_tile): New. (new_oacc_loop_raw): Initialize e_mask, adjust for ifns vector. (finish_oacc_loop): Adjust for ifns vector. (oacc_loop_discover_walk): Append loop abstraction sites to list, add case for GOACC_TILE fns. (oacc_loop_xform_loop): Delete. (oacc_loop_process): Iterate over call list directly, and add handling for GOACC_TILE fns. (oacc_loop_fixed_partitions): Determine default auto, deal with TILE, dump partitioning. (oacc_loop_auto_partitions): Add outer_assign parm. Assign all but vector partitioning to outer loops. Assign 2 partitions to loops when available. Add TILE handling. (oacc_loop_partition): Adjust oacc_loop_auto_partitions call. (execite_oacc_device_lower): Process GOACC_TILE fns, ignore unknown specs. * tree-nested.c (convert_nonlocal_omp_clauses): Allow OMP_CLAUSE_TILE. * tree.c (omp_clause_num_ops): Adjust TILE ops. * tree.h (OMP_CLAUSE_TILE_ITERVAR, OMP_CLAUSE_TILE_COUNT): New. gcc/c/ * c-parser.c (c_parser_omp_clause_collapse): Disallow tile. (c_parser_oacc_clause_tile): Disallow collapse. Fix parsing and semantic checking. * c-parser.c (c_parser_omp_for_loop): Accept tiling constructs. gcc/cp/ * parser.c (cp_parser_oacc_clause_tile): Disallow collapse. Fix parsing. Parse constant expression. Remove semantic checking. (cp_parser_omp_clause_collapse): Disallow tile. (cp_parser_omp_for_loop): Deal with tile clause. Don't emit a parse error about missing for after already emitting one. Use more conventional for idiom for unbounded loop. * pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_TILE. * semantics.c (finish_omp_clauses): Correct TILE semantic check. (finish_omp_for): Deal with tile clause. gcc/fortran/ * openmp.c (resolve_omp_clauses): Error on directives containing both tile and collapse clauses. (resolve_oacc_loop_blocks): Represent '*' tile arguments as zero. * trans-openmp.c (gfc_trans_omp_do): Lower tiled loops like collapsed loops. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: Remove xfail. * c-c++-common/goacc/loop-auto-1.c: Adjust and add additional case. * c-c++-common/goacc/loop-auto-2.c: New. * c-c++-common/goacc/tile.c: Include stdbool, fix expected errors. * c-c++-common/goacc/tile-2.c: New. * g++.dg/goacc/template.C: Test tile subst. Adjust erroneous uses. * g++.dg/goacc/tile-1.C: New, check tile subst. * gcc.dg/goacc/loop-processing-1.c: Adjust dg-final pattern. * gfortran.dg/goacc/combined-directives.f90: Remove xfail. * gfortran.dg/goacc/tile-1.f90: New test. * gfortran.dg/goacc/tile-2.f90: New test. * gfortran.dg/goacc/tile-lowering.f95: New test. libgomp/ * testsuite/libgomp.oacc-c-c++-common/tile-1.c: New. * testsuite/libgomp.oacc-c-c++-common/loop-auto-1.c: Adjust and add additional case. * testsuite/libgomp.oacc-c-c++-common/vprop.c: XFAIL under "openacc_nvidia_accel_selected". * libgomp.oacc-fortran/nested-function-1.f90 (test2): Add num_workers(8) clause. From-SVN: r245300
2017-02-09 13:46:20 +00:00
!$acc parallel num_workers(8)
[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
! Use "gang(static:1)" here and below to effectively turn gang-redundant
! execution mode into something like gang-single.
!$acc loop gang(static:1) collapse(1)
do 115 k=1,3
!$acc loop collapse(2)
dokk: do kk=1,3
do kkk=1,3
a(k,kk,kkk) = 1
enddo
enddo dokk
115 continue
!$acc loop gang(static:1) collapse(1)
do k=1,3
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 16:00:52 +00:00
if (any(a(k,1:3,1:3).ne.1)) STOP 2
[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
enddo
! Use "gang(static:1)" here and below to effectively turn gang-redundant
! execution mode into something like gang-single.
!$acc loop gang(static:1) collapse(1)
dol: do 120 l=1,3
!$acc loop collapse(2)
doll: do ll=1,3
do lll=1,3
a(l,ll,lll) = 2
enddo
enddo doll
120 end do dol
!$acc loop gang(static:1) collapse(1)
do l=1,3
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 16:00:52 +00:00
if (any(a(l,1:3,1:3).ne.2)) STOP 3
[PR middle-end/71373] Handle more OMP_CLAUSE_* in nested function decomposition gcc/ * gimplify.c (gimplify_adjust_omp_clauses): Discard OMP_CLAUSE_TILE. * omp-low.c (scan_sharing_clauses): Don't expect OMP_CLAUSE_TILE. gcc/testsuite/ * c-c++-common/goacc/combined-directives.c: XFAIL tree scanning for OpenACC tile clauses. * gfortran.dg/goacc/combined-directives.f90: Likewise. gcc/ PR middle-end/71373 * tree-nested.c (convert_nonlocal_omp_clauses) (convert_local_omp_clauses): Handle OMP_CLAUSE_ASYNC, OMP_CLAUSE_WAIT, OMP_CLAUSE_INDEPENDENT, OMP_CLAUSE_AUTO, OMP_CLAUSE__CACHE_, OMP_CLAUSE_TILE. gcc/testsuite/ PR middle-end/71373 * gcc.dg/goacc/nested-function-1.c: New file. * gcc.dg/goacc/nested-function-2.c: Likewise. * gcc.dg/goacc/pr71373.c: Likewise. * gfortran.dg/goacc/cray-2.f95: Likewise. * gfortran.dg/goacc/loop-1-2.f95: Likewise. * gfortran.dg/goacc/loop-3-2.f95: Likewise. * gfortran.dg/goacc/cray.f95: Update. * gfortran.dg/goacc/loop-1.f95: Likewise. * gfortran.dg/goacc/loop-3.f95: Likewise. * gfortran.dg/goacc/subroutines.f90: Update, and rename to... * gfortran.dg/goacc/nested-function-1.f90: ... this new file. libgomp/testsuite/ PR middle-end/71373 * libgomp.oacc-c/nested-function-1.c: New file. * libgomp.oacc-c/nested-function-2.c: Likewise. * libgomp.oacc-fortran/nested-function-1.f90: Likewise. * libgomp.oacc-fortran/nested-function-2.f90: Likewise. * libgomp.oacc-fortran/nested-function-3.f90: Likewise. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r237291
2016-06-10 11:22:51 +02:00
enddo
!$acc end parallel
end subroutine test2
end program collapse2