[gcc/devel/omp/gcc-11] Update expected messages in kernels-decompose-2 tests

[gcc/devel/omp/gcc-11] Update expected messages in kernels-decompose-2 tests

[Kwok Yeung]

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

commit 8d89b4f61bb697d4a70fb5dde04d11ac162f31b7
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Thu Apr 29 14:38:15 2021 -0700

    Update expected messages in kernels-decompose-2 tests
    
    This changes expected messages that differ between mainline and OG11.  On
    OG10, these messages were added in the patch:
    
    081a01963ca8 Update expected messages, errors and warnings for "kernels" tests
    
    2021-04-29  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
            gcc/testsuite/
            * c-c++-common/goacc/kernels-decompose-2.c (main): Update expected
            messages.
            * gfortran.dg/goacc/kernels-decompose-2.f95 (main): Update expected
            messages.

Diff:
---
 gcc/testsuite/ChangeLog.omp                             |  7 +++++++
 gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c  | 10 +++++-----
 gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 |  8 ++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 75e72ad5fbd..32e62a4a4b0 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2021-04-29  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	* c-c++-common/goacc/kernels-decompose-2.c (main): Update expected
+	messages.
+	* gfortran.dg/goacc/kernels-decompose-2.f95 (main): Update expected
+	messages.
+	
 2021-04-22  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c
index b8b31d5e3c0..0681b4323a5 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c
@@ -55,7 +55,7 @@ main ()
 
 #pragma acc kernels loop /* { dg-line l_loop_i[incr c_loop_i] } */
   /* { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i } */
-  /* { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
+  /* { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
   for (int i = 0; i < N; i++)
     b[i] = a[N - i - 1];
 
@@ -63,13 +63,13 @@ main ()
   {
 #pragma acc loop /* { dg-line l_loop_i[incr c_loop_i] } */
     /* { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i } */
-    /* { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
+    /* { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
     for (int i = 0; i < N; i++)
       b[i] = a[N - i - 1];
 
 #pragma acc loop /* { dg-line l_loop_i[incr c_loop_i] } */
     /* { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i } */
-    /* { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
+    /* { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
     for (int i = 0; i < N; i++)
       c[i] = a[i] * b[i];
 
@@ -77,7 +77,7 @@ main ()
 
 #pragma acc loop /* { dg-line l_loop_i[incr c_loop_i] } */
     /* { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i } */
-    /* { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
+    /* { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */
     for (int i = 0; i < N; i++)
       c[i] += a[i];
 
@@ -116,7 +116,7 @@ main ()
 	b[j] = f_w (c[j]);
   }
 
-#pragma acc kernels
+#pragma acc kernels /* { dg-warning "region contains gang partitioned code but is not gang partitioned" } */
   {
     y = f_g (a[5]); /* { dg-line l_part[incr c_part] } */
     /*TODO If such a construct is placed in its own part (like it is, here), can't this actually use gang paralelism, instead of "gang-single"?
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
index 80907bebfdf..20310b61e09 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95
@@ -50,7 +50,7 @@ program main
 
   !$acc kernels loop ! { dg-line l_loop_i[incr c_loop_i] }
   ! { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i }
-  ! { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
+  ! { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
   do i = 1, N
      b(i) = a(N - i + 1)
   end do
@@ -58,14 +58,14 @@ program main
   !$acc kernels
   !$acc loop ! { dg-line l_loop_i[incr c_loop_i] }
   ! { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i }
-  ! { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
+  ! { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
   do i = 1, N
      b(i) = a(N - i + 1)
   end do
 
   !$acc loop ! { dg-line l_loop_i[incr c_loop_i] }
   ! { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i }
-  ! { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
+  ! { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
   do i = 1, N
      c(i) = a(i) * b(i)
   end do
@@ -74,7 +74,7 @@ program main
 
   !$acc loop ! { dg-line l_loop_i[incr c_loop_i] }
   ! { dg-message "note: forwarded loop nest in OpenACC 'kernels' region to 'parloops' for analysis" "" { target *-*-* } l_loop_i$c_loop_i }
-  ! { dg-optimized "assigned OpenACC seq loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
+  ! { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i }
   do i = 1, N
      c(i) = c(i) + a(i)
   end do