Skip to content

Commit 5fbc22d

Browse files
LU-JOHNarsenm
andcommitted
Clean up code.
Co-authored-by: Matt Arsenault <[email protected]>
1 parent 2c0e79c commit 5fbc22d

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5956,6 +5956,10 @@ SITargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
59565956
return lowerWaveReduce(MI, *BB, *getSubtarget(), AMDGPU::S_XOR_B64);
59575957
case AMDGPU::S_UADDO_PSEUDO:
59585958
case AMDGPU::S_USUBO_PSEUDO: {
5959+
<<<<<<< HEAD
5960+
=======
5961+
const DebugLoc &DL = MI.getDebugLoc();
5962+
>>>>>>> 27321ddcdbe2 (Clean up code.)
59595963
MachineOperand &Dest0 = MI.getOperand(0);
59605964
MachineOperand &Dest1 = MI.getOperand(1);
59615965
MachineOperand &Src0 = MI.getOperand(2);
@@ -5970,11 +5974,8 @@ SITargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
59705974
.add(Src1);
59715975
// clang-format on
59725976

5973-
const TargetRegisterClass *Dest1RC = MRI.getRegClass(Dest1.getReg());
5974-
unsigned Dest1Size = TRI->getRegSizeInBits(*Dest1RC);
5975-
assert(Dest1Size == 64 || Dest1Size == 32);
59765977
unsigned SelOpc =
5977-
(Dest1Size == 64) ? AMDGPU::S_CSELECT_B64 : AMDGPU::S_CSELECT_B32;
5978+
Subtarget->isWave64() ? AMDGPU::S_CSELECT_B64 : AMDGPU::S_CSELECT_B32;
59785979
BuildMI(*BB, MI, DL, TII->get(SelOpc), Dest1.getReg()).addImm(1).addImm(0);
59795980

59805981
MI.eraseFromParent();

0 commit comments

Comments
 (0)