[PATCH] D116055: [mlir] Canonicalizer constructor should accept disabled/enabled patterns

[Jeff Niu via Phabricator via llvm-commits]

Mogball updated this revision to Diff 395558.
Mogball added a comment.

Make clear that the labels used to filter patterns are debug names, and may be empty.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D116055/new/

https://reviews.llvm.org/D116055

Files:
  mlir/include/mlir/Rewrite/FrozenRewritePatternSet.h
  mlir/include/mlir/Transforms/Passes.h
  mlir/lib/Transforms/Canonicalizer.cpp


Index: mlir/lib/Transforms/Canonicalizer.cpp
===================================================================
--- mlir/lib/Transforms/Canonicalizer.cpp
+++ mlir/lib/Transforms/Canonicalizer.cpp
@@ -21,7 +21,13 @@
 namespace {
 /// Canonicalize operations in nested regions.
 struct Canonicalizer : public CanonicalizerBase<Canonicalizer> {
-  Canonicalizer(const GreedyRewriteConfig &config) : config(config) {}
+  Canonicalizer(const GreedyRewriteConfig &config,
+                ArrayRef<std::string> disabledPatterns,
+                ArrayRef<std::string> enabledPatterns)
+      : config(config) {
+    this->disabledPatterns = disabledPatterns;
+    this->enabledPatterns = enabledPatterns;
+  }
 
   Canonicalizer() {
     // Default constructed Canonicalizer takes its settings from command line
@@ -61,6 +67,9 @@
 
 /// Creates an instance of the Canonicalizer pass with the specified config.
 std::unique_ptr<Pass>
-mlir::createCanonicalizerPass(const GreedyRewriteConfig &config) {
-  return std::make_unique<Canonicalizer>(config);
+createCanonicalizerPass(const GreedyRewriteConfig &config,
+                        ArrayRef<std::string> disabledPatterns = llvm::None,
+                        ArrayRef<std::string> enabledPatterns = llvm::None) {
+  return std::make_unique<Canonicalizer>(config, disabledPatterns,
+                                         enabledPatterns);
 }
Index: mlir/include/mlir/Transforms/Passes.h
===================================================================
--- mlir/include/mlir/Transforms/Passes.h
+++ mlir/include/mlir/Transforms/Passes.h
@@ -62,8 +62,17 @@
 std::unique_ptr<Pass> createCanonicalizerPass();
 
 /// Creates an instance of the Canonicalizer pass with the specified config.
+/// `disabledPatterns` is a set of labels used to filter out input patterns with
+/// a debug label or debug name in this set. `enabledPatterns` is a set of
+/// labels used to filter out input patterns that do not have one of the labels
+/// in this set. Debug labels must be set explicitly on patterns or when adding
+/// them with `RewritePatternSet::addWithLabel`. Debug names may be empty, but
+/// patterns created with `RewritePattern::create` have their default debug name
+/// set to their type name.
 std::unique_ptr<Pass>
-createCanonicalizerPass(const GreedyRewriteConfig &config);
+createCanonicalizerPass(const GreedyRewriteConfig &config,
+                        ArrayRef<std::string> disabledPatterns = llvm::None,
+                        ArrayRef<std::string> enabledPatterns = llvm::None);
 
 /// Creates a pass to perform common sub expression elimination.
 std::unique_ptr<Pass> createCSEPass();
Index: mlir/include/mlir/Rewrite/FrozenRewritePatternSet.h
===================================================================
--- mlir/include/mlir/Rewrite/FrozenRewritePatternSet.h
+++ mlir/include/mlir/Rewrite/FrozenRewritePatternSet.h
@@ -40,9 +40,13 @@
 
   /// Freeze the patterns held in `patterns`, and take ownership.
   /// `disabledPatternLabels` is a set of labels used to filter out input
-  /// patterns with a label in this set. `enabledPatternLabels` is a set of
-  /// labels used to filter out input patterns that do not have one of the
-  /// labels in this set.
+  /// patterns with a debug label or debug name in this set.
+  /// `enabledPatternLabels` is a set of labels used to filter out input
+  /// patterns that do not have one of the labels in this set. Debug labels must
+  /// be set explicitly on patterns or when adding them with
+  /// `RewritePatternSet::addWithLabel`. Debug names may be empty, but patterns
+  /// created with `RewritePattern::create` have their default debug name set to
+  /// their type name.
   FrozenRewritePatternSet(
       RewritePatternSet &&patterns,
       ArrayRef<std::string> disabledPatternLabels = llvm::None,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D116055.395558.patch
Type: text/x-patch
Size: 3839 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211221/55497235/attachment.bin>