From cef44a234219e38e1c28c902ff24586150eef682 Mon Sep 17 00:00:00 2001 From: Aditya Nandakumar Date: Tue, 11 Dec 2018 00:48:50 +0000 Subject: [GISel]: Refactor MachineIRBuilder to allow passing additional parameters to build Instrs https://reviews.llvm.org/D55294 Previously MachineIRBuilder::buildInstr used to accept variadic arguments for sources (which were either unsigned or MachineInstrBuilder). While this worked well in common cases, it doesn't allow us to build instructions that have multiple destinations. Additionally passing in other optional parameters in the end (such as flags) is not possible trivially. Also a trivial call such as B.buildInstr(Opc, Reg1, Reg2, Reg3) can be interpreted differently based on the opcode (2defs + 1 src for unmerge vs 1 def + 2srcs). This patch refactors the buildInstr to buildInstr(Opc, ArrayRef, ArrayRef) where DstOps and SrcOps are typed unions that know how to add itself to MachineInstrBuilder. After this patch, most invocations would look like B.buildInstr(Opc, {s32, DstReg}, {SrcRegs..., SrcMIBs..}); Now all the other calls (such as buildAdd, buildSub etc) forward to buildInstr. It also makes it possible to build instructions with multiple defs. Additionally in a subsequent patch, we should make it possible to add flags directly while building instructions. Additionally, the main buildInstr method is now virtual and other builders now only have to override buildInstr (for say constant folding/cseing) is straightforward. Also attached here (https://reviews.llvm.org/F7675680) is a clang-tidy patch that should upgrade the API calls if necessary. llvm-svn: 348815 --- .../CodeGen/GlobalISel/LegalizerHelperTest.cpp | 44 +++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp') diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp index 9ab5a80f5ae..997bd926305 100644 --- a/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp +++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerHelperTest.cpp @@ -28,7 +28,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTTZ0) { DefineLegalizerInfo( A, { getActionDefinitionsBuilder(G_CTTZ_ZERO_UNDEF).legalFor({s64}); }); // Build Instr - auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, LLT::scalar(64), Copies[0]); + auto MIBCTTZ = + B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -57,7 +58,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTTZ1) { DefineLegalizerInfo(A, { getActionDefinitionsBuilder(G_CTLZ).legalFor({s64}); }); // Build Instr - auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, LLT::scalar(64), Copies[0]); + auto MIBCTTZ = + B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -88,7 +90,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTTZ2) { DefineLegalizerInfo( A, { getActionDefinitionsBuilder(G_CTPOP).legalFor({s64}); }); // Build - auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, LLT::scalar(64), Copies[0]); + auto MIBCTTZ = + B.buildInstr(TargetOpcode::G_CTTZ, {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -116,8 +119,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTTZ3) { DefineLegalizerInfo(A, { getActionDefinitionsBuilder(G_CTTZ).legalFor({s64}); }); // Build - auto MIBCTTZ = - B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF, LLT::scalar(64), Copies[0]); + auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF, + {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -141,7 +144,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTLZ0) { DefineLegalizerInfo( A, { getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF).legalFor({s64}); }); // Build - auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, LLT::scalar(64), Copies[0]); + auto MIBCTLZ = + B.buildInstr(TargetOpcode::G_CTLZ, {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -169,7 +173,8 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTLZLibcall) { DefineLegalizerInfo( A, { getActionDefinitionsBuilder(G_CTLZ_ZERO_UNDEF).libcallFor({s64}); }); // Build - auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, LLT::scalar(64), Copies[0]); + auto MIBCTLZ = + B.buildInstr(TargetOpcode::G_CTLZ, {LLT::scalar(64)}, {Copies[0]}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -200,7 +205,7 @@ TEST_F(LegalizerHelperTest, LowerBitCountingCTLZ1) { // Trunc it to s8. LLT s8{LLT::scalar(8)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); - auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, s8, MIBTrunc); + auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -240,7 +245,7 @@ TEST_F(LegalizerHelperTest, WidenBitCountingCTLZ) { LLT s8{LLT::scalar(8)}; LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); - auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, s8, MIBTrunc); + auto MIBCTLZ = B.buildInstr(TargetOpcode::G_CTLZ, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -273,7 +278,8 @@ TEST_F(LegalizerHelperTest, WidenBitCountingCTLZZeroUndef) { LLT s8{LLT::scalar(8)}; LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); - auto MIBCTLZ_ZU = B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, s8, MIBTrunc); + auto MIBCTLZ_ZU = + B.buildInstr(TargetOpcode::G_CTLZ_ZERO_UNDEF, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -306,7 +312,7 @@ TEST_F(LegalizerHelperTest, WidenBitCountingCTPOP) { LLT s8{LLT::scalar(8)}; LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); - auto MIBCTPOP = B.buildInstr(TargetOpcode::G_CTPOP, s8, MIBTrunc); + auto MIBCTPOP = B.buildInstr(TargetOpcode::G_CTPOP, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -338,7 +344,7 @@ TEST_F(LegalizerHelperTest, WidenBitCountingCTTZ_ZERO_UNDEF) { LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); auto MIBCTTZ_ZERO_UNDEF = - B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF, s8, MIBTrunc); + B.buildInstr(TargetOpcode::G_CTTZ_ZERO_UNDEF, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -369,7 +375,7 @@ TEST_F(LegalizerHelperTest, WidenBitCountingCTTZ) { LLT s8{LLT::scalar(8)}; LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); - auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, s8, MIBTrunc); + auto MIBCTTZ = B.buildInstr(TargetOpcode::G_CTTZ, {s8}, {MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -402,10 +408,8 @@ TEST_F(LegalizerHelperTest, WidenUADDO) { LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1)); - auto MIBUAddO = B.buildInstr(TargetOpcode::G_UADDO, s8) - .addDef(CarryReg) - .addUse(MIBTrunc->getOperand(0).getReg()) - .addUse(MIBTrunc->getOperand(0).getReg()); + auto MIBUAddO = + B.buildInstr(TargetOpcode::G_UADDO, {s8, CarryReg}, {MIBTrunc, MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); @@ -441,10 +445,8 @@ TEST_F(LegalizerHelperTest, WidenUSUBO) { LLT s16{LLT::scalar(16)}; auto MIBTrunc = B.buildTrunc(s8, Copies[0]); unsigned CarryReg = MRI->createGenericVirtualRegister(LLT::scalar(1)); - auto MIBUSUBO = B.buildInstr(TargetOpcode::G_USUBO, s8) - .addDef(CarryReg) - .addUse(MIBTrunc->getOperand(0).getReg()) - .addUse(MIBTrunc->getOperand(0).getReg()); + auto MIBUSUBO = + B.buildInstr(TargetOpcode::G_USUBO, {s8, CarryReg}, {MIBTrunc, MIBTrunc}); AInfo Info(MF->getSubtarget()); DummyGISelObserver Observer; LegalizerHelper Helper(*MF, Info, Observer); -- cgit v1.2.3