[llvm] a6e1de4 - [gicombiner] Add parse failure tests for defs/match

[Daniel Sanders via llvm-commits]

Author: Daniel Sanders
Date: 2019-10-25T12:56:49-07:00
New Revision: a6e1de4afc51560df18c95cb616dec51248ed660

URL: https://github.com/llvm/llvm-project/commit/a6e1de4afc51560df18c95cb616dec51248ed660
DIFF: https://github.com/llvm/llvm-project/commit/a6e1de4afc51560df18c95cb616dec51248ed660.diff

LOG: [gicombiner] Add parse failure tests for defs/match

Added: 
    llvm/test/TableGen/GICombinerEmitter/defs-invalid.td
    llvm/test/TableGen/GICombinerEmitter/match-invalid.td

Modified: 
    llvm/utils/TableGen/GICombinerEmitter.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td b/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td
new file mode 100644
index 000000000000..fe11ef4673ec
--- /dev/null
+++ b/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td
@@ -0,0 +1,42 @@
+// RUN: not llvm-tblgen -I %p/../../../include -gen-global-isel-combiner \
+// RUN:     -combiners=MyCombiner %s 2>&1 | \
+// RUN:     FileCheck -implicit-check-not=error %s
+
+include "llvm/Target/Target.td"
+include "llvm/Target/GlobalISel/Combine.td"
+
+def MyTargetISA : InstrInfo;
+def MyTarget : Target { let InstructionSet = MyTargetISA; }
+
+def dummy;
+
+def missing_defs_node : GICombineRule<
+  (dummy),
+  (dummy),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Expected defs operator
+// CHECK-NEXT: def missing_defs_node : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def no_roots : GICombineRule<
+  (defs),
+  (dummy),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Combine rules must have at least one root
+// CHECK-NEXT: def no_roots : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def unknown_kind : GICombineRule<
+  (defs dummy:$a),
+  (dummy),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Expected a subclass of GIDefKind or a sub-dag whose operator is of type GIDefKindWithArgs
+// CHECK-NEXT: def unknown_kind : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def MyCombiner: GICombinerHelper<"GenMyCombiner", [
+// CHECK: :[[@LINE-1]]:{{[0-9]+}}: error: Failed to parse one or more rules
+  missing_defs_node,
+  no_roots,
+  unknown_kind
+]>;

diff  --git a/llvm/test/TableGen/GICombinerEmitter/match-invalid.td b/llvm/test/TableGen/GICombinerEmitter/match-invalid.td
new file mode 100644
index 000000000000..2d67f1ea5498
--- /dev/null
+++ b/llvm/test/TableGen/GICombinerEmitter/match-invalid.td
@@ -0,0 +1,71 @@
+// RUN: not llvm-tblgen -I %p/../../../include -gen-global-isel-combiner \
+// RUN:     -combiners=MyCombiner %s 2>&1 | \
+// RUN:     FileCheck -implicit-check-not=error %s
+
+include "llvm/Target/Target.td"
+include "llvm/Target/GlobalISel/Combine.td"
+
+def MyTargetISA : InstrInfo;
+def MyTarget : Target { let InstructionSet = MyTargetISA; }
+
+def dummy;
+
+def R0 : Register<"r0"> { let Namespace = "MyTarget"; }
+def GPR32 : RegisterClass<"MyTarget", [i32], 32, (add R0)>;
+class I<dag OOps, dag IOps, list<dag> Pat>
+  : Instruction {
+  let Namespace = "MyTarget";
+  let OutOperandList = OOps;
+  let InOperandList = IOps;
+  let Pattern = Pat;
+}
+def MOV : I<(outs GPR32:$dst), (ins GPR32:$src1), []>;
+
+def missing_match_node : GICombineRule<
+  (defs root:$a),
+  (dummy),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Expected match operator
+// CHECK-NEXT: def missing_match_node : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def null_matcher : GICombineRule<
+  (defs root:$a),
+  (match),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Matcher is empty
+// CHECK-NEXT: def null_matcher : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def unknown_kind1 : GICombineRule<
+  (defs root:$a),
+  (match 0),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Expected a subclass of GIMatchKind or a sub-dag whose operator is either of a GIMatchKindWithArgs or Instruction
+// CHECK-NEXT: def unknown_kind1 : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def unknown_kind2 : GICombineRule<
+  (defs root:$a),
+  (match (dummy)),
+  (dummy)>;
+// CHECK: :[[@LINE-4]]:{{[0-9]+}}: error: Expected a subclass of GIMatchKind or a sub-dag whose operator is either of a GIMatchKindWithArgs or Instruction
+// CHECK-NEXT: def unknown_kind2 : GICombineRule<
+// CHECK: :[[@LINE-6]]:{{[0-9]+}}: error: Failed to parse rule
+
+def multidef_but_not_an_error: GICombineRule<
+  (defs root:$a),
+  (match (MOV $a, $b),
+         (MOV $a, $b)),
+  (dummy)>;
+// CHECK-NOT: :[[@LINE-5]]:{{[0-9]+}}: error:
+
+def MyCombiner: GICombinerHelper<"GenMyCombiner", [
+// CHECK: :[[@LINE-1]]:{{[0-9]+}}: error: Failed to parse one or more rules
+  missing_match_node,
+  null_matcher,
+  unknown_kind1,
+  unknown_kind2,
+  // Rules omitted from a matcher can be as broken as you like. They will not be read.
+  // multidef_but_not_an_error
+]>;

diff  --git a/llvm/utils/TableGen/GICombinerEmitter.cpp b/llvm/utils/TableGen/GICombinerEmitter.cpp
index 5dc4d6b07740..dee8e9a6e3f0 100644
--- a/llvm/utils/TableGen/GICombinerEmitter.cpp
+++ b/llvm/utils/TableGen/GICombinerEmitter.cpp
@@ -337,6 +337,9 @@ void GICombinerEmitter::generateCodeForRule(raw_ostream &OS,
 
 void GICombinerEmitter::run(raw_ostream &OS) {
   gatherRules(Rules, Combiner->getValueAsListOfDefs("Rules"));
+  if (ErrorsPrinted)
+    PrintFatalError(Combiner->getLoc(), "Failed to parse one or more rules");
+
   NamedRegionTimer T("Emit", "Time spent emitting the combiner",
                      "Code Generation", "Time spent generating code",
                      TimeRegions);