Use Generic-SPMD for target teams distribute + parallel kernels

Author: skatrak

Diff for: mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

@@ -2099,10 +2099,9 @@ TargetRegionFlags TargetOp::getKernelExecFlags(Operation *capturedOp) {
     if (teamsOp->getParentOp() != targetOp.getOperation())
       return TargetRegionFlags::generic;
 
-    TargetRegionFlags result =
-        TargetRegionFlags::generic | TargetRegionFlags::trip_count;
-
-    // Find single nested parallel-do and add spmd flag (generic-spmd case).
+    // Find single immediately nested captured omp.parallel and add spmd flag
+    // (generic-spmd case).
+    //
     // TODO: This shouldn't have to be done here, as it is too easy to break.
     // The openmp-opt pass should be updated to be able to promote kernels like
     // this from "Generic" to "Generic-SPMD". However, the use of the
@@ -2115,24 +2114,17 @@ TargetRegionFlags TargetOp::getKernelExecFlags(Operation *capturedOp) {
                              sibling->hasTrait<OpTrait::IsTerminator>());
         });
 
-    if (!isa_and_present<LoopNestOp>(nestedCapture))
-      return result;
-
-    int numNestedWrappers;
-    LoopWrapperInterface *nestedWrapper =
-        getInnermostWrapper(cast<LoopNestOp>(nestedCapture), numNestedWrappers);
-
-    if (numNestedWrappers != 1 || !isa<WsloopOp>(nestedWrapper))
-      return result;
+    TargetRegionFlags result =
+        TargetRegionFlags::generic | TargetRegionFlags::trip_count;
 
-    Operation *parallelOp = (*nestedWrapper)->getParentOp();
-    if (!isa_and_present<ParallelOp>(parallelOp))
+    if (!nestedCapture)
       return result;
 
-    if (parallelOp->getParentOp() != capturedOp)
-      return result;
+    while (nestedCapture->getParentOp() != capturedOp)
+      nestedCapture = nestedCapture->getParentOp();
 
-    return result | TargetRegionFlags::spmd;
+    return isa<ParallelOp>(nestedCapture) ? result | TargetRegionFlags::spmd
+                                          : result;
   }
   // Detect target-parallel-wsloop[-simd].
   else if (isa<WsloopOp>(innermostWrapper)) {