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

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

[Kwok Yeung]

https://gcc.gnu.org/g:bf0b96ecd4c9dc9ab363e2384c2c84c3d3a45c6a

commit bf0b96ecd4c9dc9ab363e2384c2c84c3d3a45c6a
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         | 2 +-
 gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95              | 2 +-
 gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95           | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 7e507fcc750..9d8c7830ed9 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 f96f416cd98..2c705673629 100644
--- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95
@@ -22,7 +22,7 @@ program main
 
   !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1))
   do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC seq loop parallelism" }
-                  ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 23 }
+                  ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 24 }
      c(i) = a(f (i)) + b(f (i))
   end do
   !$acc end kernels
diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
index bcd73475eb7..3d2defd38c2 100644
--- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95
@@ -18,7 +18,7 @@ program main
 
   !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1))
   do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC gang loop parallelism" }
-                  ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 19 }
+                  ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 20 }
      c(i) = a(i) + b(i)
   end do
   !$acc end kernels
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
index 9af0c943757..826838d27a1 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" }
 ! { dg-additional-options "-O2" } for 'parloops'.