11b8286a83
gcc/ PR middle-end/90115 * flag-types.h (enum openacc_privatization): New. * params.opt (-param=openacc-privatization): New. * doc/invoke.texi (openacc-privatization): Document it. * omp-general.h (get_openacc_privatization_dump_flags): New function. * omp-low.c (oacc_privatization_candidate_p): Add diagnostics. * omp-offload.c (execute_oacc_device_lower) <IFN_UNIQUE_OACC_PRIVATE>: Re-work diagnostics. * target.def (goacc.adjust_private_decl): Add 'location_t' parameter. * doc/tm.texi: Regenerate. * config/gcn/gcn-protos.h (gcn_goacc_adjust_private_decl): Adjust. * config/gcn/gcn-tree.c (gcn_goacc_adjust_private_decl): Likewise. * config/nvptx/nvptx.c (nvptx_goacc_adjust_private_decl): Likewise. Preserve it for... (nvptx_goacc_expand_var_decl): ... use here. gcc/testsuite/ PR middle-end/90115 * c-c++-common/goacc/privatization-1-compute-loop.c: New file. * c-c++-common/goacc/privatization-1-compute.c: Likewise. * c-c++-common/goacc/privatization-1-routine_gang-loop.c: Likewise. * c-c++-common/goacc/privatization-1-routine_gang.c: Likewise. * gfortran.dg/goacc/privatization-1-compute-loop.f90: Likewise. * gfortran.dg/goacc/privatization-1-compute.f90: Likewise. * gfortran.dg/goacc/privatization-1-routine_gang-loop.f90: Likewise. * gfortran.dg/goacc/privatization-1-routine_gang.f90: Likewise. * c-c++-common/goacc-gomp/nesting-1.c: Update. * c-c++-common/goacc/private-reduction-1.c: Likewise. * gfortran.dg/goacc/private-3.f95: Likewise. libgomp/ PR middle-end/90115 * testsuite/libgomp.oacc-fortran/private-atomic-1-vector.f90: New file. * testsuite/libgomp.oacc-c-c++-common/firstprivate-1.c: Update. * testsuite/libgomp.oacc-c-c++-common/host_data-7.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-3.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-4.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-5.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-3.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-4.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-5.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-6.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-vector-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-vector-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-3.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-4.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-5.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-6.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-7.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-g-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-g-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-gwv-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-gwv-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-g-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-gwv-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-v-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-v-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-w-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-w-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-red-wv-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-v-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-w-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/loop-wv-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/parallel-reduction.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/private-atomic-1-gang.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/private-atomic-1.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/private-variables.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/routine-4.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/static-variable-1.c: 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/declare-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/host_data-5.F90: Likewise. * testsuite/libgomp.oacc-fortran/if-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90: Likewise. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90: Likewise. * testsuite/libgomp.oacc-fortran/optional-private.f90: Likewise. * testsuite/libgomp.oacc-fortran/parallel-dims.f90: Likewise. * testsuite/libgomp.oacc-fortran/private-atomic-1-gang.f90: Likewise. * testsuite/libgomp.oacc-fortran/private-atomic-1-worker.f90: Likewise. * testsuite/libgomp.oacc-fortran/private-variables.f90: Likewise. * testsuite/libgomp.oacc-fortran/privatized-ref-2.f90: Likewise. * testsuite/libgomp.oacc-fortran/routine-7.f90: Likewise.
251 lines
5.9 KiB
Fortran
251 lines
5.9 KiB
Fortran
! { dg-do run }
|
|
! { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } }
|
|
|
|
! { dg-additional-options "-fopt-info-all-omp" }
|
|
! { dg-additional-options "--param=openacc-privatization=noisy" }
|
|
! { dg-additional-options "-foffload=-fopt-info-all-omp" }
|
|
! { dg-additional-options "-foffload=--param=openacc-privatization=noisy" }
|
|
! for testing/documenting aspects of that functionality.
|
|
|
|
! Tests to exercise the declare directive along with
|
|
! the clauses: copy
|
|
! copyin
|
|
! copyout
|
|
! create
|
|
! present
|
|
! present_or_copy
|
|
! present_or_copyin
|
|
! present_or_copyout
|
|
! present_or_create
|
|
|
|
module vars
|
|
implicit none
|
|
integer z
|
|
!$acc declare create (z)
|
|
end module vars
|
|
|
|
subroutine subr5 (a, b, c, d)
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: i
|
|
integer :: a(N)
|
|
!$acc declare present_or_copyin (a)
|
|
integer :: b(N)
|
|
!$acc declare present_or_create (b)
|
|
integer :: c(N)
|
|
!$acc declare present_or_copyout (c)
|
|
integer :: d(N)
|
|
!$acc declare present_or_copy (d)
|
|
|
|
i = 0
|
|
|
|
!$acc parallel
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 }
|
|
do i = 1, N
|
|
b(i) = a(i)
|
|
c(i) = b(i)
|
|
d(i) = d(i) + b(i)
|
|
end do
|
|
!$acc end parallel
|
|
|
|
end subroutine
|
|
|
|
subroutine subr4 (a, b)
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: i
|
|
integer :: a(N)
|
|
!$acc declare present (a)
|
|
integer :: b(N)
|
|
!$acc declare copyout (b)
|
|
|
|
i = 0
|
|
|
|
!$acc parallel
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 }
|
|
do i = 1, N
|
|
b(i) = a(i)
|
|
end do
|
|
!$acc end parallel
|
|
|
|
end subroutine
|
|
|
|
subroutine subr3 (a, c)
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: i
|
|
integer :: a(N)
|
|
!$acc declare present (a)
|
|
integer :: c(N)
|
|
!$acc declare copyin (c)
|
|
|
|
i = 0
|
|
|
|
!$acc parallel
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 }
|
|
do i = 1, N
|
|
a(i) = c(i)
|
|
c(i) = 0
|
|
end do
|
|
!$acc end parallel
|
|
|
|
end subroutine
|
|
|
|
subroutine subr2 (a, b, c)
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: i
|
|
integer :: a(N)
|
|
!$acc declare present (a)
|
|
integer :: b(N)
|
|
!$acc declare create (b)
|
|
integer :: c(N)
|
|
!$acc declare copy (c)
|
|
|
|
i = 0
|
|
|
|
!$acc parallel
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 }
|
|
do i = 1, N
|
|
b(i) = a(i)
|
|
c(i) = b(i) + c(i) + 1
|
|
end do
|
|
!$acc end parallel
|
|
|
|
end subroutine
|
|
|
|
subroutine subr1 (a)
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: i
|
|
integer :: a(N)
|
|
!$acc declare present (a)
|
|
|
|
i = 0
|
|
|
|
!$acc parallel
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-1 }
|
|
do i = 1, N
|
|
a(i) = a(i) + 1
|
|
end do
|
|
!$acc end parallel
|
|
|
|
end subroutine
|
|
|
|
subroutine test (a, e)
|
|
use openacc
|
|
implicit none
|
|
logical :: e
|
|
integer, parameter :: N = 8
|
|
integer :: a(N)
|
|
|
|
if (acc_is_present (a) .neqv. e) STOP 1
|
|
|
|
end subroutine
|
|
|
|
subroutine subr0 (a, b, c, d)
|
|
! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } .-1 }
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-2 }
|
|
! { dg-note {variable 'a\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-3 }
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: a(N)
|
|
!$acc declare copy (a)
|
|
integer :: b(N)
|
|
integer :: c(N)
|
|
integer :: d(N)
|
|
integer :: i
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
|
|
call subr1 (a)
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
|
|
call subr2 (a, b, c)
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
|
|
do i = 1, N
|
|
if (c(i) .ne. 8) STOP 2
|
|
end do
|
|
|
|
call subr3 (a, c)
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
|
|
do i = 1, N
|
|
if (a(i) .ne. 2) STOP 3
|
|
if (c(i) .ne. 8) STOP 4
|
|
end do
|
|
|
|
call subr4 (a, b)
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
|
|
do i = 1, N
|
|
if (b(i) .ne. 8) STOP 5
|
|
end do
|
|
|
|
call subr5 (a, b, c, d)
|
|
|
|
call test (a, .true.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
call test (d, .false.)
|
|
|
|
do i = 1, N
|
|
if (c(i) .ne. 8) STOP 6
|
|
if (d(i) .ne. 13) STOP 7
|
|
end do
|
|
|
|
end subroutine
|
|
|
|
program main
|
|
! { dg-note {variable 'C\.[0-9]+' declared in block potentially has improper OpenACC privatization level: 'const_decl'} "TODO" { target *-*-* } .-1 }
|
|
! { dg-note {variable 'D\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-2 }
|
|
! { dg-note {variable 'S\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-3 }
|
|
! { dg-note {variable 'desc\.[0-9]+' declared in block is candidate for adjusting OpenACC privatization level} "TODO" { target *-*-* } .-4 }
|
|
use vars
|
|
use openacc
|
|
implicit none
|
|
integer, parameter :: N = 8
|
|
integer :: a(N)
|
|
integer :: b(N)
|
|
integer :: c(N)
|
|
integer :: d(N)
|
|
integer :: i
|
|
|
|
a(:) = 2
|
|
b(:) = 3
|
|
c(:) = 4
|
|
d(:) = 5
|
|
|
|
if (acc_is_present (z) .neqv. .true.) STOP 8
|
|
|
|
call subr0 (a, b, c, d)
|
|
|
|
call test (a, .false.)
|
|
call test (b, .false.)
|
|
call test (c, .false.)
|
|
call test (d, .false.)
|
|
|
|
do i = 1, N
|
|
if (a(i) .ne. 8) STOP 9
|
|
if (b(i) .ne. 8) STOP 10
|
|
if (c(i) .ne. 8) STOP 11
|
|
if (d(i) .ne. 13) STOP 12
|
|
end do
|
|
|
|
end program
|