Add 'libgomp.oacc-fortran/declare-allocatable-1.f90'

	libgomp/
	* testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90: New.

Co-authored-by: Thomas Schwinge <thomas@codesourcery.com>
(cherry picked from commit 8c357d884b16cb3c14cba8a61be5b53fd04a6bfe)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 1dff229f1b7505d574d73084475bef2021086ac0..3d28db31ac61592c5ca805ec1968597f33bbb0ea 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-11-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Backported from master:
+       2022-11-02  Cesar Philippidis  <cesar@codesourcery.com>
+                   Thomas Schwinge  <thomas@codesourcery.com>
+
+       * testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90: New.
+
 2022-11-02  Tobias Burnus  <tobias@codesourcery.com>
 
        * testsuite/libgomp.fortran/target-enter-data-3.f90: New test.

diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90
index c231b9aa574c9c898e1a5c228c4aa7bdf5223193..1c8ccd9f61f25f874d3f846d564731b992859601 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90
@@ -1,7 +1,33 @@
-! Test declare create with allocatable arrays.
+! Test OpenACC 'declare create' with allocatable arrays.
 
 ! { dg-do run }
-! { dg-additional-options "-Wopenacc-parallelism" }
+
+!TODO-OpenACC-declare-allocate
+! Not currently implementing correct '-DACC_MEM_SHARED=0' behavior:
+! Missing support for OpenACC "Changes from Version 2.0 to 2.5":
+! "The 'declare create' directive with a Fortran 'allocatable' has new behavior".
+! { dg-xfail-run-if TODO { *-*-* } { -DACC_MEM_SHARED=0 } }
+
+!TODO { dg-additional-options -fno-inline } for stable results regarding OpenACC 'routine'.
+
+! { dg-additional-options -fopt-info-all-omp }
+! { dg-additional-options -foffload=-fopt-info-all-omp }
+
+! { dg-additional-options --param=openacc-privatization=noisy }
+! { dg-additional-options -foffload=--param=openacc-privatization=noisy }
+! Prune a few: uninteresting, and potentially varying depending on GCC configuration (data types):
+! { dg-prune-output {note: variable '[Di]\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} }
+
+! { dg-additional-options -Wopenacc-parallelism }
+
+! It's only with Tcl 8.5 (released in 2007) that "the variable 'varName'
+! passed to 'incr' may be unset, and in that case, it will be set to [...]",
+! so to maintain compatibility with earlier Tcl releases, we manually
+! initialize counter variables:
+! { dg-line l_dummy[variable c 0] }
+! { dg-message dummy {} { target iN-VAl-Id } l_dummy } to avoid
+! "WARNING: dg-line var l_dummy defined, but not used".
+
 
 module vars
   implicit none
@@ -36,28 +62,33 @@ program test
      end function fun2
   end interface
 
-  if (allocated (b)) stop 1
+  if (allocated (b)) error stop
 
   ! Test local usage of an allocated declared array.
 
   allocate (b(n))
 
-  if (.not.allocated (b)) stop 2
-  if (acc_is_present (b) .neqv. .true.) stop 3
+  if (.not.allocated (b)) error stop
+  if (.not.acc_is_present (b)) error stop
 
   a = 2.0
 
-  !$acc parallel loop
+  !$acc parallel loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause is candidate for adjusting OpenACC privatization level} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' ought to be adjusted for OpenACC privatization level: 'vector'} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' adjusted for OpenACC privatization level: 'vector'} {} { target { ! openacc_host_selected } } l$c }
+  ! { dg-note {variable 'i\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
      b(i) = i * a
   end do
 
-  if (.not.acc_is_present (b)) stop 4
+  if (.not.acc_is_present (b)) error stop
 
   !$acc update host(b)
 
   do i = 1, n
-     if (b(i) /= i*a) stop 5
+     if (b(i) /= i*a) error stop
   end do
 
   deallocate (b)
@@ -67,19 +98,20 @@ program test
 
   allocate (b(n))
 
-  if (.not.allocated (b)) stop 6
-  if (acc_is_present (b) .neqv. .true.) stop 7
+  if (.not.allocated (b)) error stop
+  if (.not.acc_is_present (b)) error stop
 
   !$acc parallel
-  call sub1
+  call sub1 ! { dg-line l[incr c] }
+  ! { dg-optimized {assigned OpenACC gang worker vector loop parallelism} {} { target *-*-* } l$c }
   !$acc end parallel
 
-  if (.not.acc_is_present (b)) stop 8
+  if (.not.acc_is_present (b)) error stop
 
   !$acc update host(b)
 
   do i = 1, n
-     if (b(i) /= i*2) stop 9
+     if (b(i) /= i*2) error stop
   end do
 
   deallocate (b)
@@ -89,42 +121,53 @@ program test
 
   call sub2
 
-  if (.not.acc_is_present (b)) stop 10
+  if (.not.acc_is_present (b)) error stop
 
   !$acc update host(b)
 
   do i = 1, n
-     if (b(i) /= 1.0) stop 11
+     if (b(i) /= 1.0) error stop
   end do
 
   deallocate (b)
 
-  if (allocated (b)) stop 12
+  if (allocated (b)) error stop
 
   ! Test the usage of an allocated declared array inside an acc
   ! routine function.
 
   allocate (b(n))
 
-  if (.not.allocated (b)) stop 13
-  if (acc_is_present (b) .neqv. .true.) stop 14
+  if (.not.allocated (b)) error stop
+  if (.not.acc_is_present (b)) error stop
 
-  !$acc parallel loop
+  !$acc parallel loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause is candidate for adjusting OpenACC privatization level} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' ought to be adjusted for OpenACC privatization level: 'vector'} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' adjusted for OpenACC privatization level: 'vector'} {} { target { ! openacc_host_selected } } l$c }
+  ! { dg-note {variable 'i\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
      b(i) = 1.0
   end do
 
-  !$acc parallel loop
+  !$acc parallel loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause is candidate for adjusting OpenACC privatization level} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' ought to be adjusted for OpenACC privatization level: 'vector'} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' adjusted for OpenACC privatization level: 'vector'} {} { target { ! openacc_host_selected } } l$c }
+  ! { dg-note {variable 'i\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
-     b(i) = fun1 (i)
+     b(i) = fun1 (i) ! { dg-line l[incr c] }
+     ! { dg-optimized {assigned OpenACC seq loop parallelism} {} { target *-*-* } l$c }
   end do
 
-  if (.not.acc_is_present (b)) stop 15
+  if (.not.acc_is_present (b)) error stop
 
   !$acc update host(b)
 
   do i = 1, n
-     if (b(i) /= i) stop 16
+     if (b(i) /= i) error stop
   end do
 
   deallocate (b)
@@ -134,10 +177,15 @@ program test
 
   allocate (b(n))
 
-  if (.not.allocated (b)) stop 17
-  if (acc_is_present (b) .neqv. .true.) stop 18
+  if (.not.allocated (b)) error stop
+  if (.not.acc_is_present (b)) error stop
 
-  !$acc parallel loop
+  !$acc parallel loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause is candidate for adjusting OpenACC privatization level} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' ought to be adjusted for OpenACC privatization level: 'vector'} {} { target *-*-* } l$c }
+  !   { dg-note {variable 'i' adjusted for OpenACC privatization level: 'vector'} {} { target { ! openacc_host_selected } } l$c }
+  ! { dg-note {variable 'i\.[0-9]+' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
      b(i) = 1.0
   end do
@@ -148,24 +196,30 @@ program test
      b(i) = fun2 (i)
   end do
 
-  if (.not.acc_is_present (b)) stop 19
+  if (.not.acc_is_present (b)) error stop
 
   do i = 1, n
-     if (b(i) /= i*i) stop 20
+     if (b(i) /= i*i) error stop
   end do
 
   deallocate (b)
-end program test
+end program test ! { dg-line l[incr c] }
+! { dg-bogus {note: variable 'overflow\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {TODO n/a} { xfail *-*-* } l$c }
+! { dg-bogus {note: variable 'not_prev_allocated\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {TODO n/a} { xfail *-*-* } l$c }
+! { dg-bogus {note: variable 'parm\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: artificial} {TODO n/a} { xfail *-*-* } l$c }
 
 ! Set each element in array 'b' at index i to i*2.
 
-subroutine sub1 ! { dg-warning "region is worker partitioned" }
+subroutine sub1 ! { dg-line subroutine_sub1 }
   use vars
   implicit none
   integer i
   !$acc routine gang
+  ! { dg-bogus {[Ww]arning: region is worker partitioned but does not contain worker partitioned code} {TODO default 'gang' 'vector'} { xfail *-*-* } subroutine_sub1 }
 
-  !$acc loop
+  !$acc loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
      b(i) = i*2
   end do
@@ -181,10 +235,12 @@ subroutine sub2
 
   allocate (b(n))
 
-  if (.not.allocated (b)) stop 21
-  if (acc_is_present (b) .neqv. .true.) stop 22
+  if (.not.allocated (b)) error stop
+  if (.not.acc_is_present (b)) error stop
 
-  !$acc parallel loop
+  !$acc parallel loop ! { dg-line l[incr c] }
+  ! { dg-note {variable 'i' in 'private' clause isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l$c }
+  ! { dg-optimized {assigned OpenACC gang vector loop parallelism} {} { target *-*-* } l$c }
   do i = 1, n
      b(i) = 1.0
   end do