[mlir] Failure when const matcher fails, added a test to catch

[jpienaar]

Woops, I missed this asking for this test. Thanks

[mehdi_amini]

Can you provide a more descriptive commit message? I can't understand it (feel free to provide a description on top of the title).

Also you can leave out "added a test to catch", adding a test with a bug fix is implicit :)

mlir/test/mlir-tblgen/pattern.mlir

func @testConstOpReplaced() -> (i32) {
   %1 = "test.constant"() {value = 2 : i32} : () -> i32
 
   // CHECK: [[V0:%.+]] = "test.op_s"([[C0]]) {value = 2 : i32}
   %2 = "test.op_r"(%0, %1) : (i32, i32) -> i32
 
   // CHECK: [[V0]]
   return %2 : i32
 }
+
 // CHECK-LABEL: testConstOpMatchFailure
 func @testConstOpMatchFailure() -> (i64) {
   // CHECK-DAG: [[C0:%.+]] = constant 1
   %0 = "test.constant"() {value = 1 : i64} : () -> i64
 
   // CHECK-DAG: [[C1:%.+]] = constant 2
   %1 = "test.constant"() {value = 2 : i64} : () -> i64
 
   // CHECK: [[V0:%.+]] = "test.op_r"([[C0]], [[C1]])
   %2 = "test.op_r"(%0, %1) : (i64, i64) -> i64
 
   // CHECK: [[V0]]
   return %2 : i64
 }
 
+// CHECK-LABEL: testConstOpMatchNonConst
+func @testConstOpMatchNonConst(%arg0 : i32) -> (i32) {
+  // CHECK-DAG: [[C0:%.+]] = constant 1
+  %0 = "test.constant"() {value = 1 : i32} : () -> i32
+
+  // CHECK: [[V0:%.+]] = "test.op_r"([[C0]], %arg0)
+  %1 = "test.op_r"(%0, %arg0) : (i32, i32) -> i32
+
+  // CHECK: [[V0]]
+  return %1 : i32
+}
+
+
+
 //===----------------------------------------------------------------------===//
 // Test Enum Attributes
 //===----------------------------------------------------------------------===//
 
 // CHECK-LABEL: verifyStrEnumAttr
 func @verifyStrEnumAttr() -> i32 {
   // CHECK: "test.str_enum_attr"() {attr = "B"}
   %0 = "test.str_enum_attr"() {attr = "A"} : () -> i32

mlir/tools/mlir-tblgen/RewriterGen.cpp

void PatternEmitter::emitNativeCodeMatch(DagNode tree, StringRef opName,
   if (tree.getNumArgs() > 8) {
     PrintFatalError(loc,
                     "unsupported NativeCodeCall matcher argument numbers: " +
                         Twine(tree.getNumArgs()));
   }
 
   raw_indented_ostream::DelimitedScope scope(os);
 
+  os << "if(!" << opName << ") return failure();\n";
   for (int i = 0, e = tree.getNumArgs(); i != e; ++i) {
     std::string argName = formatv("arg{0}_{1}", depth, i);
     if (DagNode argTree = tree.getArgAsNestedDag(i)) {
       os << "Value " << argName << ";\n";
     } else {
       auto leaf = tree.getArgAsLeaf(i);
       if (leaf.isAttrMatcher() || leaf.isConstantAttr()) {
         os << "Attribute " << argName << ";\n";