Index: llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h =================================================================== --- llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h +++ llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h @@ -24,6 +24,11 @@ return P.match(MRI, R); } +template +bool mi_match(MachineInstr &MI, const MachineRegisterInfo &MRI, Pattern &&P) { + return P.match(MRI, &MI); +} + // TODO: Extend for N use. template struct OneUse_match { SubPatternT SubPat; @@ -181,6 +186,11 @@ return true; return false; } + static bool bind(const MachineRegisterInfo &MRI, MachineInstr *&MI, + MachineInstr *Inst) { + MI = Inst; + return MI; + } }; template <> struct bind_helper { Index: llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp =================================================================== --- llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp +++ llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp @@ -41,6 +41,25 @@ EXPECT_EQ(Cst, 42); } +TEST_F(AArch64GISelMITest, MachineInstrPtrBind) { + setUp(); + if (!TM) + return; + auto MIBAdd = B.buildAdd(LLT::scalar(64), Copies[0], Copies[1]); + // Test 'MachineInstr *' bind. + // Default mi_match. + MachineInstr *MIPtr = MIBAdd.getInstr(); + bool match = mi_match(MIPtr, *MRI, m_GAdd(m_Reg(), m_Reg())); + EXPECT_TRUE(match); + // Specialized mi_match for MachineInstr &. + MachineInstr &MI = *MIBAdd.getInstr(); + match = mi_match(MI, *MRI, m_GAdd(m_Reg(), m_Reg())); + EXPECT_TRUE(match); + // MachineInstrBuilder has automatic conversion to MachineInstr *. + match = mi_match(MIBAdd, *MRI, m_GAdd(m_Reg(), m_Reg())); + EXPECT_TRUE(match); +} + TEST_F(AArch64GISelMITest, MatchBinaryOp) { setUp(); if (!TM)