Fix warning syntax and typos in two libgomp tests

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Expect
	"optimized:" not "note:" in warnings.
	* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Fix typos in
	warnings.

(cherry picked from openacc-gcc-9-branch commit
d6627e7056558a844c0a26f21dfaa5e0b5040709)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 225b4b5d4541483bfa61ead4673ecaa5ab57c892..0436191ce28910e7305ce36fa874427ac47492c5 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2019-05-20  Julian Brown  <julian@codesourcery.com>
+
+       * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Expect
+       "optimized:" not "note:" in warnings.
+       * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Fix typos in
+       warnings.
+
 2019-05-16  Julian Brown  <julian@codesourcery.com>
 
        * testsuite/libgomp.oacc-c-c++-common/kernels-for-index-reuse-1.c: New

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
index bf58a139d3adfafd47b08ff37fdeff74dd36cf62..45d786d81dffa6f5e295c5c31cf92df61539385a 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
@@ -11,14 +11,14 @@ int main()
 
 #pragma acc kernels
   {
-    int c = 234; /* { dg-warning "note: beginning .gang-single. region in OpenACC .kernels. construct" } */
+    int c = 234; /* { dg-warning "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } */
 
-#pragma acc loop independent gang /* { dg-warning "note: assigned OpenACC gang loop parallelism" } */
-    /* { dg-warning "note: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } 16 } */
+#pragma acc loop independent gang /* { dg-warning "optimized: assigned OpenACC gang loop parallelism" } */
+    /* { dg-warning "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } 16 } */
     for (int i = 0; i < N; ++i)
       b[i] = c;
 
-    a = c; /* { dg-warning "note: beginning .gang-single. region in OpenACC .kernels. construct" } */
+    a = c; /* { dg-warning "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } */
   }
 
   for (int i = 0; i < N; ++i)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
index 7a8a85c3bb03e56c5eec39bfdd1a602bcee4ac2b..dc6e1eac938d77e607ad8123d8d019e1090fdc7d 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
@@ -1,7 +1,5 @@
 /* OpenACC dimensions with the serial construct.  */
 
-/* { dg-additional-options "-foffload-force" } */
-
 #include <limits.h>
 #include <openacc.h>
 #include <gomp-constants.h>
@@ -58,10 +56,10 @@ int main ()
     gangs_max = workers_max = vectors_max = INT_MIN;
     gangs_actual = workers_actual = vectors_actual = 1;
 #pragma acc serial
-    /* { dg-warning "region contains gang partitoned code but is not gang partitioned" "" { target *-*-* } 60 } */
-    /* { dg-warning "region contains worker partitoned code but is not worker partitioned" "" { target *-*-* } 60 } */
-    /* { dg-warning "region contains vector partitoned code but is not vector partitioned" "" { target *-*-* } 60 } */
-    /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 60 } */
+    /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 58 } */
+    /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 58 } */
+    /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 58 } */
+    /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 58 } */
     {
       if (acc_on_device (acc_device_nvidia))
        {