[gcc/devel/omp/gcc-12] Additional Fortran testsuite fixes for kernels loops annotation pass.

[gcc/devel/omp/gcc-12] Additional Fortran testsuite fixes for kernels loops annotation pass.

[Kwok Yeung]

https://gcc.gnu.org/g:8ce5285eeb9b0a616a5ea0585fda279ec2fc71c4

commit 8ce5285eeb9b0a616a5ea0585fda279ec2fc71c4
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Thu Mar 19 08:32:24 2020 -0700

    Additional Fortran testsuite fixes for kernels loops annotation pass.
    
    These testsuite fixes are specific to the og10 branch, so are being
    segregated from the ones that apply to mainline in a separate commit
    from the main Fortran kernels loop annotation patch.
    
    2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>
    
            gcc/testsuite/
            * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Adjust
            line numbering.
            * gfortran.dg/goacc/classify-kernels.f95: Likewise.
            * gfortran.dg/goacc/kernels-decompose-2.f95: Add
            -fno-openacc-kernels-annotate-loops.

Diff:
---
 gcc/testsuite/ChangeLog.omp                                    |  8 ++++++++
 .../gfortran.dg/goacc/classify-kernels-unparallelized.f95      | 10 +++++-----
 gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95           |  8 ++++----
 gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95        |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 44e9841c1c8..60e1aec394b 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* gfortran.dg/goacc/classify-kernels-unparallelized.f95: Adjust
+	line numbering.
+	* gfortran.dg/goacc/classify-kernels.f95: Likewise.
+	* gfortran.dg/goacc/kernels-decompose-2.f95: Add
+	-fno-openacc-kernels-annotate-loops.
+
 2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>
 	    Gergö Barany <gergo@codesourcery.com>
 
diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95
index a867fe96bb9..b48bb7c758a 100644
--- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95
@@ -25,11 +25,11 @@ program main
 
   call setup(a, b)
 
-  !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-line l_compute1 }
-  ! { dg-optimized {assigned OpenACC seq loop parallelism} {} { target *-*-* } l_compute1 }
-  ! { dg-note {beginning 'parloops' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 }
-  do i = 0, n - 1
-     c(i) = a(f (i)) + b(f (i))
+  !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) 
+  do i = 0, n - 1 ! { dg-line l_loop1 }
+    ! { dg-optimized {assigned OpenACC seq loop parallelism} {} { target *-*-* } l_loop1 }
+    ! { dg-note {beginning 'parloops' part in OpenACC 'kernels' region} {} { target *-*-* } l_loop1 }
+    c(i) = a(f (i)) + b(f (i))
   end do
   !$acc end kernels
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
index 62653e2890f..a3f78e77b2b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
@@ -24,10 +24,10 @@ program main
   !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-line l_compute1 }
   ! { dg-note {OpenACC 'kernels' decomposition: variable 'i' in 'copy' clause requested to be made addressable} {} { target *-*-* } l_compute1 } */
   !   { dg-note {variable 'i' made addressable} {} { target *-*-* } l_compute1 } */
-  ! { dg-optimized {assigned OpenACC gang loop parallelism} {} { target *-*-* } l_compute1 }
-  ! { dg-note {beginning 'parloops' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 }
-  do i = 0, n - 1
-     c(i) = a(i) + b(i)
+  do i = 0, n - 1 ! { dg-line l_loop1 }
+    ! { dg-optimized {assigned OpenACC gang loop parallelism} {} { target *-*-* } l_loop1 }
+    ! { dg-note {beginning 'parloops' part in OpenACC 'kernels' region} {} { target *-*-* } l_loop1 }
+    c(i) = a(i) + b(i)
   end do
   !$acc end kernels
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
index f6228b97944..15612139ada 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
@@ -1,5 +1,6 @@
 ! Test OpenACC 'kernels' construct decomposition.
 
+! { dg-additional-options "-fno-openacc-kernels-annotate-loops" }
 ! { dg-additional-options "-fopt-info-omp-all" }
 
 ! { dg-additional-options "--param=openacc-kernels=decompose" }