Add -fno-openacc-kernels-annotate-loops option to more testcases.

The testcases being tweaked here are present on the og10 branch but not on
FSF mainline.

2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>

	gcc/testsuite/
	* c-c++-common/goacc/kernels-decompose-2.c: Add
	-fno-openacc-kernels-annotate-loops.
	* c-c++-common/goacc/note-parallelism-1-kernels-loops.c: Likewise.
	* c-c++-common/goacc/note-parallelism-kernels-loops.c: Likewise.

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 869b87c882dc7a83e423e890ce06f49824b7c065..db031acbba1e533780e83df2b7f5dba81c82c54d 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * c-c++-common/goacc/kernels-decompose-2.c: Add
+       -fno-openacc-kernels-annotate-loops.
+       * c-c++-common/goacc/note-parallelism-1-kernels-loops.c: Likewise.
+       * c-c++-common/goacc/note-parallelism-kernels-loops.c: Likewise.
+
 2020-03-27  Sandra Loosemore  <sandra@codesourcery.com>
 
        * c-c++-common/goacc/classify-kernels-unparallelized.c: Add

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 3ce9490f02f9d9a17431ef0faee0d48d1196c372..9144ac8fecb7fc78d63b0517e41bc27afa1f01f2 100644 (file)
--- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c
@@ -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" }

diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c
index 336be88f2301677660a75835d5050c8911da37fb..51bd963c8633b5a6cbad61211c82692ca332a150 100644 (file)
--- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c
+++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c
@@ -1,6 +1,7 @@
 /* Test the output of "-fopt-info-optimized-omp" for an OpenACC 'kernels'
    construct containing loops.  */
 
+/* { dg-additional-options "-fno-openacc-kernels-annotate-loops" } */
 /* { dg-additional-options "-fopt-info-optimized-omp" } */
 
 //TODO update accordingly

diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c
index 365464bba20c9197abbe34db681c85c2806c3fed..ee28b964687ac9677b92b6895fe8f81b37a161b9 100644 (file)
--- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c
+++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c
@@ -1,6 +1,7 @@
 /* Test the output of "-fopt-info-optimized-omp" for an OpenACC 'kernels'
    construct containing loops.  */
 
+/* { dg-additional-options "-fno-openacc-kernels-annotate-loops" } */
 /* { dg-additional-options "-fopt-info-optimized-omp" } */
 
 //TODO update accordingly