[gcc/devel/omp/gcc-12] Add -fno-openacc-kernels-annotate-loops option to more testcases.

[gcc/devel/omp/gcc-12] Add -fno-openacc-kernels-annotate-loops option to more testcases.

[Kwok Yeung]

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

commit e8dc40997e460db58d53781ed7670cd9a61943ec
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Sun Mar 15 20:31:09 2020 -0700

    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:
---
 gcc/testsuite/ChangeLog.omp                                        | 7 +++++++
 gcc/testsuite/c-c++-common/goacc/kernels-decompose-2.c             | 1 +
 .../c-c++-common/goacc/note-parallelism-1-kernels-loops.c          | 1 +
 gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c  | 1 +
 4 files changed, 10 insertions(+)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 72ccac8f1cd..e59a826b9e2 100644
--- 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 3ce9490f02f..9144ac8fecb 100644
--- 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 336be88f230..51bd963c863 100644
--- 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 365464bba20..ee28b964687 100644
--- 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