Fix is_oacc_parallel_or_serial for kernel regions

2021-04-07  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/
	* omp-low.c (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 ba99bebf072f3b38e7706b2a0a8dea16bb5626f3..14c6f4b84034c75c88f1aaaecdfbdf70aaa85b4d 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.c (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-01  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
        * omp-expand.c (expand_oacc_for): Convert .tile variable to

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 7ffcf01fe0bd6a8d87b04d67a30237503954971b..0251dbe7186b3294585fa094a81fed638d2554eb 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -215,7 +215,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.