[mlir][NFC] GreedyPatternRewriteDriver: Remove single-op entry point

[springerm]

Summary

This is to simplify the API. The multi-op entry point can be used directly. GreedyRewriteStrictness must now be specified explicitly.

Depends On: D142611

[mehdi_amini]

This is to simplify the API

I'm a bit confused: how is this simplifying the API? From the client point of view at least it seems like it does not?

[springerm]

Mixup in Differential Revision part of the commit message.

[springerm]

restore diff

[springerm]

rebase

[springerm]

In D142613#4084371, @mehdi_amini wrote:

This is to simplify the API

I'm a bit confused: how is this simplifying the API? From the client point of view at least it seems like it does not?

Rebased it on top of all the other changes. There are now two almost identical overloads. There is a chance that the ArrayRef<Operation *> overload can be accidentally called because Operation * can implicitly convert to ArrayRef<Operation *>. And the first bool * parameter of each overload is a different one (erased vs changed).

mlir/include/mlir/Transforms/GreedyPatternRewriteDriver.h

 /// be matched. `changed` is set to true if the IR was modified at all.
 /// `allOpsErased` is set to true if all ops in `ops` were erased.
 LogicalResult
 applyOpPatternsAndFold(ArrayRef<Operation *> ops,
                        const FrozenRewritePatternSet &patterns,
                        GreedyRewriteConfig config = GreedyRewriteConfig(),
                        bool *changed = nullptr, bool *allErased = nullptr);
 
-/// Applies the specified patterns on `op` while also trying to fold it.
-/// This function is a shortcut for the ArrayRef<Operation *> overload and
-/// behaves the same way.
-inline LogicalResult
-applyOpPatternsAndFold(Operation *op, const FrozenRewritePatternSet &patterns,
-                       GreedyRewriteConfig config = GreedyRewriteConfig(),
-                       bool *erased = nullptr) {
-  return applyOpPatternsAndFold(ArrayRef(op), patterns, config,
-                                /*changed=*/nullptr, erased);
-}
-
 } // namespace mlir
 
 #endif // MLIR_TRANSFORMS_GREEDYPATTERNREWRITEDRIVER_H_

mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp

if (!opGroupQueue.empty()) {
 
       if (res) {
         // Simplify/canonicalize the affine.for.
         RewritePatternSet patterns(res.getContext());
         AffineForOp::getCanonicalizationPatterns(patterns, res.getContext());
         GreedyRewriteConfig config;
         config.strictMode = GreedyRewriteStrictness::ExistingOps;
         bool erased;
-        (void)applyOpPatternsAndFold(res, std::move(patterns), config, &erased);
+        (void)applyOpPatternsAndFold(res.getOperation(), std::move(patterns),
+                                     config, /*changed=*/nullptr, &erased);
         if (!erased && !prologue)
           prologue = res;
         if (!erased)
           epilogue = res;
       }
     } else {
       // Start of first interval.
       lbShift = d * step;

mlir/lib/Dialect/Affine/Utils/Utils.cpp

LogicalResult mlir::hoistAffineIfOp(AffineIfOp ifOp, bool *folded) {
   // entangled with application of patterns, we may fold/end up erasing the op,
   // in which case we return with `folded` being set.
   RewritePatternSet patterns(ifOp.getContext());
   AffineIfOp::getCanonicalizationPatterns(patterns, ifOp.getContext());
   FrozenRewritePatternSet frozenPatterns(std::move(patterns));
   GreedyRewriteConfig config;
   config.strictMode = GreedyRewriteStrictness::ExistingOps;
   bool erased;
-  (void)applyOpPatternsAndFold(ifOp, frozenPatterns, config, &erased);
+  (void)applyOpPatternsAndFold(ifOp.getOperation(), frozenPatterns, config,
+                               /*changed=*/nullptr, &erased);
   if (erased) {
     if (folded)
       *folded = true;
     return failure();
   }
   if (folded)
     *folded = false;