[01/10,OpenACC] Use "-fopenacc-kernels=parloops" to document "parloops" test cases

Message ID d6471d13-5cbf-a3fc-4160-78f29cf68f60@codesourcery.com
State New
Headers show
Series
  • Rework handling of OpenACC kernels regions
Related show

Commit Message

Kwok Cheung Yeung July 17, 2019, 9:03 p.m.
This patch introduces a new option "-fopenacc-kernels" to control how OpenACC 
kernels are processed. The current behaviour will be equivalent to 
'-fopenacc-kernels=parloops'.

2019-07-16  Thomas Schwinge  <thomas@codesourcery.com>

	gcc/
	* flag-types.h (enum openacc_kernels): New type.

	gcc/c-family/
	* c.opt (fopenacc-kernels): New flag.

	gcc/fortran/
	* lang.opt (fopenacc-kernels): New flag.

	gcc/testsuite/
	* c-c++-common/goacc/kernels-1.c: Add
	"-fopenacc-kernels=parloops".
	* c-c++-common/goacc/kernels-alias-2.c: Likewise.
	* c-c++-common/goacc/kernels-alias-3.c: Likewise.
	* c-c++-common/goacc/kernels-alias-4.c: Likewise.
	* c-c++-common/goacc/kernels-alias-5.c: Likewise.
	* c-c++-common/goacc/kernels-alias-6.c: Likewise.
	* c-c++-common/goacc/kernels-alias-7.c: Likewise.
	* c-c++-common/goacc/kernels-alias-8.c: Likewise.
	* c-c++-common/goacc/kernels-alias-ipa-pta-2.c: Likewise.
	* c-c++-common/goacc/kernels-alias-ipa-pta-3.c: Likewise.
	* c-c++-common/goacc/kernels-alias-ipa-pta-4.c: Likewise.
	* c-c++-common/goacc/kernels-alias-ipa-pta.c: Likewise.
	* c-c++-common/goacc/kernels-alias.c: Likewise.
	* c-c++-common/goacc/kernels-counter-var-redundant-load.c:
	Likewise.
	* c-c++-common/goacc/kernels-counter-vars-function-scope.c:
	Likewise.
	* c-c++-common/goacc/kernels-double-reduction-n.c: Likewise.
	* c-c++-common/goacc/kernels-double-reduction.c: Likewise.
	* c-c++-common/goacc/kernels-loop-2.c: Likewise.
	* c-c++-common/goacc/kernels-loop-3.c: Likewise.
	* c-c++-common/goacc/kernels-loop-data-2.c: Likewise.
	* c-c++-common/goacc/kernels-loop-data-enter-exit-2.c: Likewise.
	* c-c++-common/goacc/kernels-loop-data-enter-exit.c: Likewise.
	* c-c++-common/goacc/kernels-loop-data-update.c: Likewise.
	* c-c++-common/goacc/kernels-loop-data.c: Likewise.
	* c-c++-common/goacc/kernels-loop-g.c: Likewise.
	* c-c++-common/goacc/kernels-loop-mod-not-zero.c: Likewise.
	* c-c++-common/goacc/kernels-loop-n.c: Likewise.
	* c-c++-common/goacc/kernels-loop-nest.c: Likewise.
	* c-c++-common/goacc/kernels-loop.c: Likewise.
	* c-c++-common/goacc/kernels-one-counter-var.c: Likewise.
	* c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c:
	Likewise.
	* c-c++-common/goacc/kernels-reduction.c: Likewise.
	* gfortran.dg/goacc/kernels-alias-2.f95: Likewise.
	* gfortran.dg/goacc/kernels-alias-3.f95: Likewise.
	* gfortran.dg/goacc/kernels-alias-4.f95: Likewise.
	* gfortran.dg/goacc/kernels-alias.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-2.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-data-2.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-data-enter-exit.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-data-update.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-data.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-inner.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop-n.f95: Likewise.
	* gfortran.dg/goacc/kernels-loop.f95: Likewise.
	* gfortran.dg/goacc/kernels-loops-adjacent.f95: Likewise.
	* gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95:
	Likewise.

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/declare-vla.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c:
	Add "-fopenacc-kernels=parloops".
	* testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-empty.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-loop.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c:
	Likewise.
	* testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-2.f95: Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop-data.f95: Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-loop.f95: Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95:
	Likewise.
	* testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90:
	Likewise.
---
  gcc/c-family/c.opt                                               | 9 +++++++++
  gcc/flag-types.h                                                 | 6 ++++++
  gcc/fortran/lang.opt                                             | 3 +++
  gcc/testsuite/c-c++-common/goacc/kernels-1.c                     | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-3.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-4.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-5.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-6.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-7.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-8.c               | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-2.c       | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-3.c       | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-4.c       | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta.c         | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-alias.c                 | 2 ++
  .../c-c++-common/goacc/kernels-counter-var-redundant-load.c      | 2 ++
  .../c-c++-common/goacc/kernels-counter-vars-function-scope.c     | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-double-reduction-n.c    | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-double-reduction.c      | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c                | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c                | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-data-2.c           | 2 ++
  .../c-c++-common/goacc/kernels-loop-data-enter-exit-2.c          | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit.c  | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-data-update.c      | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-data.c             | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-g.c                | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-mod-not-zero.c     | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c                | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop-nest.c             | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-loop.c                  | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-one-counter-var.c       | 2 ++
  .../c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c   | 2 ++
  gcc/testsuite/c-c++-common/goacc/kernels-reduction.c             | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-alias-2.f95              | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-alias-3.f95              | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-alias-4.f95              | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95                | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95               | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95          | 2 ++
  .../gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95         | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95     | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95            | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-inner.f95           | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95               | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95                 | 2 ++
  gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95       | 2 ++
  .../gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95  | 2 ++
  libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla.c        | 3 +++
  .../libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c          | 2 ++
  .../libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c          | 2 ++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c  | 2 ++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-empty.c      | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c     | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c     | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c   | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c  | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c    | 3 +++
  .../libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c   | 3 +++
  .../libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c     | 3 +++
  .../libgomp.oacc-c-c++-common/kernels-loop-data-update.c         | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c  | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c     | 2 ++
  .../libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c        | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c     | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c  | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c       | 3 +++
  .../kernels-parallel-loop-data-enter-exit.c                      | 3 +++
  .../testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c    | 3 +++
  libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c  | 3 +++
  libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95        | 2 ++
  libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95   | 2 ++
  .../libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95      | 2 ++
  .../libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95        | 2 ++
  .../testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95  | 2 ++
  libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95     | 2 ++
  libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95          | 2 ++
  .../kernels-parallel-loop-data-enter-exit.f95                    | 2 ++
  libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90   | 2 ++
  86 files changed, 207 insertions(+)

-- 
2.8.1

Patch

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 4c8b002..4bdacb6 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1688,6 +1688,15 @@  fopenacc-dim=
  C ObjC C++ ObjC++ LTO Joined Var(flag_openacc_dims)
  Specify default OpenACC compute dimensions.

+fopenacc-kernels=
+C ObjC C++ ObjC++ RejectNegative Joined Enum(openacc_kernels) 
Var(flag_openacc_kernels) Init(OPENACC_KERNELS_PARLOOPS) Undocumented
+
+Enum
+Name(openacc_kernels) Type(enum openacc_kernels)
+
+EnumValue
+Enum(openacc_kernels) String(parloops) Value(OPENACC_KERNELS_PARLOOPS)
+
  fopenmp
  C ObjC C++ ObjC++ LTO Var(flag_openmp)
  Enable OpenMP (implies -frecursive in Fortran).
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index a210328..24a80858 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -354,4 +354,10 @@  enum cf_protection_level
    CF_FULL = CF_BRANCH | CF_RETURN,
    CF_SET = 1 << 2
  };
+
+/* OpenACC 'kernels' constructs handling.  */
+enum openacc_kernels
+{
+  OPENACC_KERNELS_PARLOOPS
+};
  #endif /* ! GCC_FLAG_TYPES_H */
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 88674cb..73e88fd 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -662,6 +662,9 @@  fopenacc-dim=
  Fortran LTO Joined Var(flag_openacc_dims)
  ; Documented in C

+fopenacc-kernels=
+Fortran RejectNegative Joined Enum(openacc_kernels) Var(flag_openacc_kernels) 
Init(OPENACC_KERNELS_PARLOOPS) Undocumented
+
  fopenmp
  Fortran LTO
  ; Documented in C
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-1.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-1.c
index 016abbd..ba3169a 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-1.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-1.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-fopt-info-optimized-omp" } */

  int
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c
index 7576a64..57f1e08 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-3.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-3.c
index 2934f12..fa8afe2 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-3.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-3.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-4.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-4.c
index f6ee5b5..e5c264a 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-4.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-4.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-5.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-5.c
index 74425fb..9fb3189 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-5.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-5.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-6.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-6.c
index 908e1ca..015bded 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-6.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-6.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-7.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-7.c
index 923d002..0c828cc 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-7.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-7.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-8.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-8.c
index 69200cc..902e71d 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-8.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-8.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-2.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-2.c
index f16d698..7a57477c 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fipa-pta -fdump-tree-optimized" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-3.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-3.c
index 1ea0e73..879141d 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-3.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-3.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fipa-pta -fdump-tree-optimized" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-4.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-4.c
index 20b21dc..41f90158 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-4.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta-4.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fipa-pta -fdump-tree-optimized" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta.c
index 969b466..e587f96 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias-ipa-pta.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fipa-pta -fdump-tree-optimized" } */

diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-alias.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-alias.c
index e8ff018..bbc0508 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-alias.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-alias.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-ealias-all" } */

diff --git 
a/gcc/testsuite/c-c++-common/goacc/kernels-counter-var-redundant-load.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-counter-var-redundant-load.c
index 0304254..dbb04d3 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-counter-var-redundant-load.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-counter-var-redundant-load.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-dom3" } */

diff --git 
a/gcc/testsuite/c-c++-common/goacc/kernels-counter-vars-function-scope.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-counter-vars-function-scope.c
index c475333..f40de67 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-counter-vars-function-scope.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-counter-vars-function-scope.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction-n.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction-n.c
index 8f7f415..d456925 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction-n.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction-n.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fopt-info-optimized-omp" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction.c
index c11d36f..caab7c8 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-double-reduction.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fopt-info-optimized-omp" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c
index acef6a1..238956c 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c
index 75e2bb7..2bbb071 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-3.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-2.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-2.c
index 7180021..e7830b6 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit-2.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit-2.c
index 0c9f833..b5c2670 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit.c
index 0bd21b6..84f92a9 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-enter-exit.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-update.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-update.c
index dd5a841..dbdce45 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-update.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data-update.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data.c
index a658182..23f4e22 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-data.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-data.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-g.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-g.c
index 73b469d..2cbd6be 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-g.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-g.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-g" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-mod-not-zero.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-mod-not-zero.c
index 5592623..28480ae 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-mod-not-zero.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-mod-not-zero.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c
index e86be1b..26bc3e0 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-n.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-nest.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop-nest.c
index 2b0e186..b3fdde1 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-nest.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-nest.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-loop.c
index 9619d53..d0423a8 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-loop.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-one-counter-var.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-one-counter-var.c
index 69539b2..15a8d37 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-one-counter-var.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-one-counter-var.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git 
a/gcc/testsuite/c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c
index 81b0fee..457a79a 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-reduction.c 
b/gcc/testsuite/c-c++-common/goacc/kernels-reduction.c
index 5921b88..7603988 100644
--- a/gcc/testsuite/c-c++-common/goacc/kernels-reduction.c
+++ b/gcc/testsuite/c-c++-common/goacc/kernels-reduction.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-O2" } */
  /* { dg-additional-options "-fdump-tree-parloops1-all" } */
  /* { dg-additional-options "-fdump-tree-optimized" } */
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-2.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-2.f95
index 6a9f241..f365896 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-2.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-ealias-all" }

diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-3.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-3.f95
index 07dc8d6..cd5e539 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-3.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-3.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-ealias-all" }

diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-4.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-4.f95
index 415eb96..0cda06e 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-alias-4.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-alias-4.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-ealias-all" }

diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95
index 62f9a71..d8dcd37 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-alias.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-ealias-all" }

diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
index ef53324..59001e4 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
index 2f1dcd6..b6f50cb 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
index 447e85d6..779073a 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
index 4edb288..30ae2cb 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
index fc113e1..b68945a 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
index 94522f5..f5c6688 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-inner.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-inner.f95
index a3ad591..18509b2 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-inner.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-inner.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fopt-info-optimized-omp" }

diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
index b9c4aea..4c43b11 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
index 6dc7b2e..4da7040 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95
index fb92da8..a83ff95 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loops-adjacent.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }

  program main
diff --git 
a/gcc/testsuite/gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95 
b/gcc/testsuite/gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95
index 48c20b9..1586e64 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95
@@ -1,3 +1,5 @@ 
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.
  ! { dg-additional-options "-O2" }
  ! { dg-additional-options "-fdump-tree-parloops1-all" }
  ! { dg-additional-options "-fdump-tree-optimized" }
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla.c
index 0f51bad..e24381d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-vla.c
@@ -1,5 +1,8 @@ 
  /* Verify OpenACC 'declare' with VLAs.  */

+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <assert.h>


diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c
index e8d65df..e40d5ab 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-2.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-fipa-pta" } */

  #include <stdlib.h>
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c
index dd8ca87..e2cf3d7 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta-3.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-fipa-pta" } */

  #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c
index 50e7dc1..5f89d48 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-alias-ipa-pta.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-fipa-pta" } */

  #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-empty.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-empty.c
index a68a7cd..8ee0da7 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-empty.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-empty.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  int
  main (void)
  {
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
index b840888..4aeeed1 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
index 31114ac..9cbace1 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c
index d36592f..cae8439 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-2.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c
index e622971..d53e393 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-3.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c
index c731278..7435c85 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-4.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c
index 67dcce2..32f47fb 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-5.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c
index b8b5dde..a310de7 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq-6.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c
index 9d9308a..e00177e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-and-seq.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 32
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c
index 997d6c7..15e2dc1 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-collapse.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 100
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
index 607c350..337ad91 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
index 8b9dd5f..214dd7e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
index 5d5da6f..7d097da 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
index c111c8f..661cb28 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
index 947bcda..2f4f699 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c
index 88258be..e5a556b 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-g.c
@@ -1,3 +1,5 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
  /* { dg-additional-options "-g" } */

  #include "kernels-loop.c"
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
index 147ebb5..eeb318e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N ((1024 * 512) + 1)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
index 9a3eaca..eeccc1d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N ((1024 * 512) + 1)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c
index 28c725a..c59c47e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-nest.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 1000
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
index 355123c..36eabb9 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
index ebcc6e1..fe30318 100644
--- 
a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
+++ 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N (1024 * 512)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c
index 95f1b77..3d02d53 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction-1.c
@@ -1,6 +1,9 @@ 
  /* Verify that a simple, explicit acc loop reduction works inside
   a kernels region.  */

+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define N 100
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c 
b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
index 8647a94..e67340c 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
@@ -1,3 +1,6 @@ 
+/* { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+   specifically testing "parloops" handling.  */
+
  #include <stdlib.h>

  #define n 10000
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95
index 4b69e81..deb9070 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-2.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95
index 4008743..c718584 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-2.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git 
a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95
index 11ae17c..ade470a 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit-2.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git 
a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95
index 4fdb862..8eb5a83 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-enter-exit.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95
index 4bee0e1..3352b76 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data-update.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95
index 307e433..6697eaf 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-data.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95
index 0090f43..8ae247f 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git 
a/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
index fe1088c..18daccc 100644
--- 
a/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
+++ 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-parallel-loop-data-enter-exit.f95
@@ -1,4 +1,6 @@ 
  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program main
    implicit none
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90 
b/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
index c7a52ed..fe6986d 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-reduction-1.f90
@@ -1,6 +1,8 @@ 
  ! Test a simple acc loop reduction inside a kernels region.

  ! { dg-do run }
+! { dg-additional-options "-fopenacc-kernels=parloops" } as this is
+! specifically testing "parloops" handling.

  program reduction
    integer, parameter     :: n = 20