R5: Removing the check for matching scan variables and reduction vari…

…ables

mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

@@ -3167,38 +3167,19 @@ LogicalResult ScanOp::verify() {
     return emitError(
         "Exactly one of EXCLUSIVE or INCLUSIVE clause is expected");
   }
-  const OperandRange &scanVars =
-      hasExclusiveVars() ? getExclusiveVars() : getInclusiveVars();
-  auto verifyScanVarsInReduction = [&scanVars](ValueRange reductionVars) {
-    for (const auto &it : scanVars)
-      if (!llvm::is_contained(reductionVars, it))
-        return false;
-    return true;
-  };
   if (mlir::omp::WsloopOp parentWsLoopOp =
           (*this)->getParentOfType<mlir::omp::WsloopOp>()) {
     if (parentWsLoopOp.getReductionModAttr() &&
         parentWsLoopOp.getReductionModAttr().getValue() ==
             mlir::omp::ReductionModifier::inscan) {
-      auto iface = llvm::cast<mlir::omp::BlockArgOpenMPOpInterface>(
-          parentWsLoopOp.getOperation());
-      if (!verifyScanVarsInReduction(iface.getReductionBlockArgs())) {
-        return emitError(
-            "List item should appear in REDUCTION clause of the parent");
-      }
       return success();
     }
-  } else if (mlir::omp::SimdOp parentSimdOp =
-                 (*this)->getParentOfType<mlir::omp::SimdOp>()) {
+  }
+  if (mlir::omp::SimdOp parentSimdOp =
+          (*this)->getParentOfType<mlir::omp::SimdOp>()) {
     if (parentSimdOp.getReductionModAttr() &&
         parentSimdOp.getReductionModAttr().getValue() ==
             mlir::omp::ReductionModifier::inscan) {
-      auto iface = llvm::cast<mlir::omp::BlockArgOpenMPOpInterface>(
-          parentSimdOp.getOperation());
-      if (!verifyScanVarsInReduction(iface.getReductionBlockArgs())) {
-        return emitError(
-            "List item should appear in REDUCTION clause of the parent");
-      }
       return success();
     }
   }

mlir/test/Dialect/OpenMP/invalid.mlir

@@ -1837,33 +1837,6 @@ combiner {
   omp.yield (%1 : f32)
 }
 
-func.func @scan_test_1(%lb: i32, %ub: i32, %step: i32) {
-  %test1f32 = "test.f32"() : () -> (!llvm.ptr)
-  %test2f32 = "test.f32"() : () -> (!llvm.ptr)
-  omp.wsloop reduction(mod:inscan, @add_f32 %test1f32 -> %arg1 : !llvm.ptr) {
-    omp.loop_nest (%i, %j) : i32 = (%lb, %ub) to (%ub, %lb) step (%step, %step) {
-  // expected-error @below {{List item should appear in REDUCTION clause of the parent}}
-       omp.scan inclusive(%test2f32 : !llvm.ptr)
-        omp.yield
-    }
-  }
-  return
-}
-
-// -----
-
-omp.declare_reduction @add_f32 : f32
-init {
- ^bb0(%arg: f32):
-  %0 = arith.constant 0.0 : f32
-  omp.yield (%0 : f32)
-}
-combiner {
-  ^bb1(%arg0: f32, %arg1: f32):
-  %1 = arith.addf %arg0, %arg1 : f32
-  omp.yield (%1 : f32)
-}
-
 func.func @scan_test_2(%lb: i32, %ub: i32, %step: i32) {
   %test1f32 = "test.f32"() : () -> (!llvm.ptr)
   omp.wsloop reduction(mod:inscan, @add_f32 %test1f32 -> %arg1 : !llvm.ptr) {