[gcc/devel/omp/gcc-12] Fix is_oacc_parallel_or_serial for kernel regions

[gcc/devel/omp/gcc-12] Fix is_oacc_parallel_or_serial for kernel regions

[Kwok Yeung]

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

commit f0ecb3a0ec3444e642df550949d6cd7ef0c712c3
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Wed Apr 7 12:49:31 2021 -0700

    Fix is_oacc_parallel_or_serial for kernel regions
    
    2021-04-07  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
            gcc/
            * omp-low.cc (is_oacc_parallel_or_serial): Handle
            GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_PARALLELIZED and
            GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_GANG_SINGLE.

Diff:
---
 gcc/ChangeLog.omp | 6 ++++++
 gcc/omp-low.cc    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 91abed94458..f031f35d57e 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,9 @@
+2021-04-07  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	* omp-low.cc (is_oacc_parallel_or_serial): Handle
+	GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_PARALLELIZED and
+	GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_GANG_SINGLE.
+
 2021-03-04  Andrew Stubbs <ams@codesourcery.com>
 
 	* dwarf2out.cc (notional_parents_list): New file variable.
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index bac635fb58c..52a894355f3 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -217,7 +217,11 @@ is_oacc_parallel_or_serial (omp_context *ctx)
 	  && ((gimple_omp_target_kind (ctx->stmt)
 	       == GF_OMP_TARGET_KIND_OACC_PARALLEL)
 	      || (gimple_omp_target_kind (ctx->stmt)
-		  == GF_OMP_TARGET_KIND_OACC_SERIAL)));
+		  == GF_OMP_TARGET_KIND_OACC_SERIAL)
+	      || (gimple_omp_target_kind (ctx->stmt)
+		  == GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_PARALLELIZED)
+	      || (gimple_omp_target_kind (ctx->stmt)
+		  == GF_OMP_TARGET_KIND_OACC_PARALLEL_KERNELS_GANG_SINGLE)));
 }
 
 /* Return whether CTX represents an OpenACC 'kernels' construct.