omp-oacc-kernels-decompose.cc: fix -fcompare-debug with GIMPLE_DEBUG

GIMPLE_DEBUG were put in a parallel region of its own, which is not
only pointless but also breaks -fcompare-debug. With this commit,
they are handled like simple assignments: those placed are places
into the same body as the loop such that only one parallel region
remains as without debugging. This fixes the existing testcase
libgomp.oacc-c-c++-common/kernels-loop-g.c.

Note: GIMPLE_DEBUG are only accepted with -fcompare-debug; if they
appear otherwise, decompose_kernels_region_body rejects them with
a sorry (unchanged).

gcc/
	* omp-oacc-kernels-decompose.cc (top_level_omp_for_in_stmt,
	decompose_kernels_region_body): Handle GIMPLE_DEBUG like
	simple assignment.

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 32a8c7b485fb60495301715f9d5ac650e85682bd..e032c05148b0bce873b6864c2e97bab6da6e28a8 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,9 @@
+2022-10-21  Tobias Burnus  <tobias@codesourcery.com>
+
+       * omp-oacc-kernels-decompose.cc (top_level_omp_for_in_stmt,
+       decompose_kernels_region_body): Handle GIMPLE_DEBUG like
+       simple assignment.
+
 2022-10-19  Tobias Burnus  <tobias@codesourcery.com>
 
        * omp-expand.cc (expand_omp_target): Fix OpenACC in case there

diff --git a/gcc/omp-oacc-kernels-decompose.cc b/gcc/omp-oacc-kernels-decompose.cc
index 4e940c1ee0f57259fa307fdb0806cf1339af5c9e..a7e3d764d523a76982e15edb35c07b27fe681f54 100644 (file)
--- a/gcc/omp-oacc-kernels-decompose.cc
+++ b/gcc/omp-oacc-kernels-decompose.cc
@@ -120,7 +120,8 @@ top_level_omp_for_in_stmt (gimple *stmt)
          for (gsi = gsi_start (body); !gsi_end_p (gsi); gsi_next (&gsi))
            {
              gimple *body_stmt = gsi_stmt (gsi);
-             if (gimple_code (body_stmt) == GIMPLE_ASSIGN)
+             if (gimple_code (body_stmt) == GIMPLE_ASSIGN
+                 || gimple_code (body_stmt) == GIMPLE_DEBUG)
                continue;
              else if (gimple_code (body_stmt) == GIMPLE_OMP_FOR
                       && gsi_one_before_end_p (gsi))
@@ -1398,7 +1399,7 @@ decompose_kernels_region_body (gimple *kernels_region, tree kernels_clauses)
            = (gimple_code (stmt) == GIMPLE_ASSIGN
               && TREE_CODE (gimple_assign_lhs (stmt)) == VAR_DECL
               && DECL_ARTIFICIAL (gimple_assign_lhs (stmt)));
-         if (!is_simple_assignment)
+         if (!is_simple_assignment && gimple_code (stmt) != GIMPLE_DEBUG)
            only_simple_assignments = false;
        }
     }