commit 256a92a07984c5b8f9741fb81892fa576f6ca39a
author Lei Zhang <antiagainst@google.com> Fri Oct 18 08:19:54 2019 -0700
committer TensorFlower Gardener <gardener@tensorflow.org> Fri Oct 18 08:23:57 2019 -0700
tree fdf8e42d70206e8a7f821803c81e264fef6587a2
parent 2133490bf22be577928ad9d3ebdd56ac2260f8d5

[DRR] Use eraseOp() to replace no-result ops

PiperOrigin-RevId: 275475229
Change-Id: I549ebee6c17035613ba14604078a5d0646420305

third_party/mlir/tools/mlir-tblgen/RewriterGen.cpp

diff --git a/third_party/mlir/tools/mlir-tblgen/RewriterGen.cpp b/third_party/mlir/tools/mlir-tblgen/RewriterGen.cpp
index 07a3d7e..cefd1d6 100644
--- a/third_party/mlir/tools/mlir-tblgen/RewriterGen.cpp
+++ b/third_party/mlir/tools/mlir-tblgen/RewriterGen.cpp
@@ -542,18 +542,26 @@
       os.indent(4) << val << ";\n";
   }
 
-  // Process replacement result patterns.
-  os.indent(4) << "SmallVector<Value *, 4> tblgen_values;";
-  for (int i = replStartIndex; i < numResultPatterns; ++i) {
-    DagNode resultTree = pattern.getResultPattern(i);
-    auto val = handleResultPattern(resultTree, offsets[i], 0);
+  if (numExpectedResults == 0) {
+    assert(replStartIndex >= numResultPatterns &&
+           "invalid auxiliary vs. replacement pattern division!");
+    // No result to replace. Just erase the op.
+    os.indent(4) << "rewriter.eraseOp(op0);\n";
+  } else {
+    // Process replacement result patterns.
+    os.indent(4) << "SmallVector<Value *, 4> tblgen_values;";
+    for (int i = replStartIndex; i < numResultPatterns; ++i) {
+      DagNode resultTree = pattern.getResultPattern(i);
+      auto val = handleResultPattern(resultTree, offsets[i], 0);
+      os.indent(4) << "\n";
+      // Resolve each symbol for all range use so that we can loop over them.
+      os << symbolInfoMap.getAllRangeUse(
+          val, "    for (auto *v : {0}) tblgen_values.push_back(v);", "\n");
+    }
     os.indent(4) << "\n";
-    // Resolve each symbol for all range use so that we can loop over them.
-    os << symbolInfoMap.getAllRangeUse(
-        val, "    for (auto *v : {0}) tblgen_values.push_back(v);", "\n");
+    os.indent(4) << "rewriter.replaceOp(op0, tblgen_values);\n";
   }
-  os.indent(4) << "\n";
-  os.indent(4) << "rewriter.replaceOp(op0, tblgen_values);\n";
+
   LLVM_DEBUG(llvm::dbgs() << "--- done emitting rewrite logic ---\n");
 }