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 --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 91abed944585d8cf7ec188894905151344e1e39e..f031f35d57e49648e315d4b574740ca73ba0643c 100644 (file)
--- 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 bac635fb58c06b014f5ec6c128f1b8671b104dbd..52a894355f3a5561efdabe2dec0f96746006d428 100644 (file)
--- 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.