c42cfb5ca3
gcc/ PR lto/70289 PR ipa/70348 PR tree-optimization/70373 PR middle-end/70533 PR middle-end/70534 PR middle-end/70535 * gimplify.c (gimplify_adjust_omp_clauses): Add or adjust data clauses for acc parallel reductions as necessary. Error on those that are private. * omp-low.c (scan_sharing_clauses): Don't install variables which are used in acc parallel reductions. (lower_rec_input_clauses): Remove dead code. (lower_oacc_reductions): Add support for reference reductions. (lower_reduction_clauses): Remove dead code. (lower_omp_target): Don't remap variables appearing in acc parallel reductions. * tree.h (OMP_CLAUSE_MAP_IN_REDUCTION): New macro. gcc/testsuite/ * c-c++-common/goacc/reduction-5.c: New test. * c-c++-common/goacc/reduction-promotions.c: New test. * gfortran.dg/goacc/reduction-3.f95: New test. * gfortran.dg/goacc/reduction-promotions.f90: New test. libgomp/ * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gang-np-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gw-np-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gwv-np-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gwv-np-2.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gwv-np-3.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-gwv-np-4.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-vector-p-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-vector-p-2.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-worker-p-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-wv-p-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-wv-p-2.c: New test. * testsuite/libgomp.oacc-c-c++-common/loop-reduction-wv-p-3.c: New test. * testsuite/libgomp.oacc-c-c++-common/par-loop-comb-reduction-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/par-loop-comb-reduction-2.c: New test. * testsuite/libgomp.oacc-c-c++-common/par-loop-comb-reduction-3.c: New test. * testsuite/libgomp.oacc-c-c++-common/par-loop-comb-reduction-4.c: New test. * testsuite/libgomp.oacc-c-c++-common/par-reduction-1.c: Add test coverage. * testsuite/libgomp.oacc-c-c++-common/par-reduction-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c: New test. * testsuite/libgomp.oacc-c-c++-common/pr70289.c: New test. * testsuite/libgomp.oacc-c-c++-common/pr70373.c: New test. * testsuite/libgomp.oacc-c-c++-common/reduction-1.c: Add test coverage. * testsuite/libgomp.oacc-c-c++-common/reduction-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/reduction-3.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/reduction-4.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/reduction-5.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/reduction-6.c: New test. * testsuite/libgomp.oacc-c-c++-common/reduction.h: New test. * testsuite/libgomp.oacc-fortran/parallel-reduction.f90: New test. * testsuite/libgomp.oacc-fortran/pr70289.f90: New test. * testsuite/libgomp.oacc-fortran/reduction-1.f90: Add test coverage. * 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: New test. From-SVN: r234840
89 lines
1.8 KiB
Fortran
89 lines
1.8 KiB
Fortran
! { dg-do run }
|
|
! { dg-additional-options "-w" }
|
|
|
|
! subroutine reduction with private and firstprivate variables
|
|
|
|
program reduction
|
|
integer, parameter :: n = 100
|
|
integer :: i, j, vsum, cs, arr(n)
|
|
|
|
call redsub_private (cs, n, arr)
|
|
call redsub_bogus (cs, n)
|
|
call redsub_combined (cs, n, arr)
|
|
|
|
vsum = 0
|
|
|
|
! Verify the results
|
|
do i = 1, n
|
|
vsum = i
|
|
do j = 1, n
|
|
vsum = vsum + 1;
|
|
end do
|
|
if (vsum .ne. arr(i)) call abort ()
|
|
end do
|
|
end program reduction
|
|
|
|
! This subroutine tests a reduction with an explicit private variable.
|
|
|
|
subroutine redsub_private(sum, n, arr)
|
|
integer :: sum, n, arr(n)
|
|
integer :: i, j, v
|
|
|
|
!$acc parallel copyout (arr)
|
|
!$acc loop gang private (v)
|
|
do j = 1, n
|
|
v = j
|
|
|
|
!$acc loop vector reduction (+:v)
|
|
do i = 1, 100
|
|
v = v + 1
|
|
end do
|
|
|
|
arr(j) = v
|
|
end do
|
|
!$acc end parallel
|
|
|
|
! verify the results
|
|
do i = 1, 10
|
|
if (arr(i) .ne. 100+i) call abort ()
|
|
end do
|
|
end subroutine redsub_private
|
|
|
|
|
|
! Bogus reduction on an impliclitly firstprivate variable. The results do
|
|
! survive the parallel region. The goal here is to ensure that gfortran
|
|
! doesn't ICE.
|
|
|
|
subroutine redsub_bogus(sum, n)
|
|
integer :: sum, n, arr(n)
|
|
integer :: i
|
|
|
|
!$acc parallel
|
|
!$acc loop gang worker vector reduction (+:sum)
|
|
do i = 1, n
|
|
sum = sum + 1
|
|
end do
|
|
!$acc end parallel
|
|
end subroutine redsub_bogus
|
|
|
|
! This reduction involving a firstprivate variable yields legitimate results.
|
|
|
|
subroutine redsub_combined(sum, n, arr)
|
|
integer :: sum, n, arr(n)
|
|
integer :: i, j
|
|
|
|
!$acc parallel copy (arr)
|
|
!$acc loop gang
|
|
do i = 1, n
|
|
sum = i;
|
|
|
|
!$acc loop reduction(+:sum)
|
|
do j = 1, n
|
|
sum = sum + 1
|
|
end do
|
|
|
|
arr(i) = sum
|
|
end do
|
|
!$acc end parallel
|
|
end subroutine redsub_combined
|