Index: llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h =================================================================== --- llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h +++ llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h @@ -255,6 +255,74 @@ } }; +// Helper for (commutative) binary generic MI. Doesn't check opcode. +template +struct AnyBinaryOp_match { + LHS_P L; + RHS_P R; + + AnyBinaryOp_match(const LHS_P &LHS, const RHS_P &RHS) : L(LHS), R(RHS) {} + template + bool match(const MachineRegisterInfo &MRI, OpTy &&Op) { + MachineInstr *TmpMI; + if (!mi_match(Op, MRI, m_MInstr(TmpMI)) || TmpMI->getNumDefs() != 1 || + TmpMI->getNumOperands() != 3) + return false; + return matchOperands(MRI, TmpMI->getOperand(1).getReg(), + TmpMI->getOperand(2).getReg()); + } + bool matchOperands(const MachineRegisterInfo &MRI, Register Op0, + Register Op1) { + return (L.match(MRI, Op0) && R.match(MRI, Op1)) || + (Commutative && R.match(MRI, Op0) && L.match(MRI, Op1)); + } +}; + +template +inline AnyBinaryOp_match m_BinOp(const LHS &L, const RHS &R) { + return AnyBinaryOp_match(L, R); +} + +template +inline AnyBinaryOp_match m_CommutativeBinOp(const LHS &L, + const RHS &R) { + return AnyBinaryOp_match(L, R); +} + +// Helper for (commutative) binary generic MI that checks Opcode. +template +struct BinaryOpWithOpcode_match : AnyBinaryOp_match { + unsigned Opcode; + + BinaryOpWithOpcode_match(unsigned Opcode, const LHS_P &LHS, const RHS_P &RHS) + : AnyBinaryOp_match(LHS, RHS), Opcode(Opcode) { + } + template + bool match(const MachineRegisterInfo &MRI, OpTy &&Op) { + MachineInstr *TmpMI; + if (mi_match(Op, MRI, m_MInstr(TmpMI))) { + if (TmpMI->getOpcode() == Opcode && TmpMI->getNumDefs() == 1 && + TmpMI->getNumOperands() == 3) { + return this->matchOperands(MRI, TmpMI->getOperand(1).getReg(), + TmpMI->getOperand(2).getReg()); + } + } + return false; + } +}; + +template +inline BinaryOpWithOpcode_match +m_BinOp(unsigned Opcode, const LHS &L, const RHS &R) { + return BinaryOpWithOpcode_match(Opcode, L, R); +} + +template +inline BinaryOpWithOpcode_match +m_CommutativeBinOp(unsigned Opcode, const LHS &L, const RHS &R) { + return BinaryOpWithOpcode_match(Opcode, L, R); +} + template inline BinaryOp_match m_GAdd(const LHS &L, const RHS &R) { Index: llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp =================================================================== --- llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp +++ llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp @@ -183,6 +183,85 @@ EXPECT_TRUE(match); EXPECT_EQ(Src0, PtrAdd->getOperand(1).getReg()); EXPECT_EQ(Src1, Copies[0]); + + auto MIBCst = B.buildConstant(s64, 42); + auto MIBAddCst = B.buildAdd(s64, MIBCst, Copies[0]); + auto MIBUnmerge = B.buildUnmerge({s32, s32}, B.buildConstant(s64, 42)); + + // m_BinOp without opcode. + // Match any binary instruction and its non-commutative operands. + match = mi_match(MIBAddCst, *MRI, m_BinOp(m_ICst(Cst), m_Reg(Src0))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); + + // Operands don't match because they are not commutative. + match = mi_match(MIBAddCst, *MRI, m_BinOp(m_Reg(Src0), m_ICst(Cst))); + EXPECT_FALSE(match); + + // Instruction is not binary. + match = mi_match(MIBCst, *MRI, m_BinOp(m_Reg(Src0), m_Reg(Src1))); + EXPECT_FALSE(match); + match = mi_match(MIBUnmerge, *MRI, m_BinOp(m_Reg(Src0), m_Reg(Src1))); + EXPECT_FALSE(match); + + // m_CommutativeBinOp without opcode. + // Match any binary instruction and its commutative operands. + match = + mi_match(MIBAddCst, *MRI, m_CommutativeBinOp(m_ICst(Cst), m_Reg(Src0))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); + + // Operands match because they are commutative. + match = + mi_match(MIBAddCst, *MRI, m_CommutativeBinOp(m_Reg(Src0), m_ICst(Cst))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); + + match = mi_match(MIBCst, *MRI, m_CommutativeBinOp(m_Reg(Src0), m_Reg(Src1))); + EXPECT_FALSE(match); + match = + mi_match(MIBUnmerge, *MRI, m_CommutativeBinOp(m_Reg(Src0), m_Reg(Src1))); + EXPECT_FALSE(match); + + // m_BinOp with opcode. + // Match binary instruction, opcode and its non-commutative operands. + match = mi_match(MIBAddCst, *MRI, + m_BinOp(TargetOpcode::G_ADD, m_ICst(Cst), m_Reg(Src0))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); + + // Opcode doesn't match. + match = mi_match(MIBAddCst, *MRI, + m_BinOp(TargetOpcode::G_MUL, m_ICst(Cst), m_Reg(Src0))); + EXPECT_FALSE(match); + + match = mi_match(MIBAddCst, *MRI, + m_BinOp(TargetOpcode::G_ADD, m_Reg(Src0), m_ICst(Cst))); + EXPECT_FALSE(match); + + // m_CommutativeBinOp with opcode. + match = mi_match( + MIBAddCst, *MRI, + m_CommutativeBinOp(TargetOpcode::G_ADD, m_ICst(Cst), m_Reg(Src0))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); + + match = mi_match( + MIBAddCst, *MRI, + m_CommutativeBinOp(TargetOpcode::G_MUL, m_ICst(Cst), m_Reg(Src0))); + EXPECT_FALSE(match); + + match = mi_match( + MIBAddCst, *MRI, + m_CommutativeBinOp(TargetOpcode::G_ADD, m_Reg(Src0), m_ICst(Cst))); + EXPECT_TRUE(match); + EXPECT_EQ(Src0, Copies[0]); + EXPECT_EQ(Cst, 42); } TEST_F(AArch64GISelMITest, MatchICmp) {