[llvm] r342997 - [globalisel][tblgen] Table optimization should consider the C++ code in C++ predicates

[Daniel Sanders via llvm-commits]

Author: dsanders
Date: Tue Sep 25 10:59:02 2018
New Revision: 342997

URL: http://llvm.org/viewvc/llvm-project?rev=342997&view=rev
Log:
[globalisel][tblgen] Table optimization should consider the C++ code in C++ predicates

This fixes PR39045


Added:
    llvm/trunk/test/TableGen/GlobalISelEmitter-PR39045.td
Modified:
    llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp

Added: llvm/trunk/test/TableGen/GlobalISelEmitter-PR39045.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/GlobalISelEmitter-PR39045.td?rev=342997&view=auto
==============================================================================
--- llvm/trunk/test/TableGen/GlobalISelEmitter-PR39045.td (added)
+++ llvm/trunk/test/TableGen/GlobalISelEmitter-PR39045.td Tue Sep 25 10:59:02 2018
@@ -0,0 +1,45 @@
+// RUN: llvm-tblgen -gen-global-isel -I %p/../../include %s -o %t
+// RUN: FileCheck %s < %t
+
+// Both predicates should be tested
+// CHECK-DAG: GIM_CheckCxxInsnPredicate, /*MI*/0, /*FnId*/GIPFP_MI_Predicate_pat_frag_b,
+// CHECK-DAG: GIM_CheckCxxInsnPredicate, /*MI*/0, /*FnId*/GIPFP_MI_Predicate_pat_frag_a,
+
+include "llvm/Target/Target.td"
+
+def MyTargetISA : InstrInfo;
+def MyTarget : Target { let InstructionSet = MyTargetISA; }
+
+
+def pat_frag_a : PatFrag <(ops node:$ptr), (load node:$ptr), [{}]> {
+   let PredicateCode = [{ return isInstA(MI); }];
+   let GISelPredicateCode = [{ return isInstA(MI); }];
+}
+
+def pat_frag_b : PatFrag <(ops node:$ptr), (load node:$ptr), [{}]> {
+   let PredicateCode = [{ return isInstB(MI); }];
+   let GISelPredicateCode = [{ return isInstB(MI); }];
+}
+
+def R0 : Register<"r0"> { let Namespace = "MyTarget"; }
+def GPR32 : RegisterClass<"MyTarget", [i32], 32, (add R0)>;
+
+def inst_a : Instruction {
+  let OutOperandList = (outs GPR32:$dst);
+  let InOperandList = (ins GPR32:$src);
+}
+def inst_b : Instruction {
+  let OutOperandList = (outs GPR32:$dst);
+  let InOperandList = (ins GPR32:$src);
+}
+
+def : Pat <
+  (pat_frag_a GPR32:$src),
+  (inst_a GPR32:$src)
+>;
+
+def : Pat <
+  (pat_frag_b GPR32:$src),
+  (inst_b GPR32:$src)
+>;
+

Modified: llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp?rev=342997&r1=342996&r2=342997&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp Tue Sep 25 10:59:02 2018
@@ -1837,6 +1837,12 @@ public:
   static bool classof(const InstructionPredicateMatcher *P) {
     return P->getKind() == IPM_GenericPredicate;
   }
+  bool isIdentical(const PredicateMatcher &B) const override {
+    return InstructionPredicateMatcher::isIdentical(B) &&
+           Predicate ==
+               static_cast<const GenericInstructionPredicateMatcher &>(B)
+                   .Predicate;
+  }
   void emitPredicateOpcodes(MatchTable &Table,
                             RuleMatcher &Rule) const override {
     Table << MatchTable::Opcode("GIM_CheckCxxInsnPredicate")