Skip to content

Commit 19592fe

Browse files
[AMDGPU] Use MachineRegisterInfo::def_instructions (NFC) (#142782)
Note that def_instructions is defined as: inline iterator_range<def_instr_iterator> def_instructions(Register Reg) const { return make_range(def_instr_begin(Reg), def_instr_end()); }
1 parent 228f668 commit 19592fe

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

llvm/lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,8 @@ bool R600VectorRegMerger::runOnMachineFunction(MachineFunction &Fn) {
324324
if (MI.getOpcode() != R600::REG_SEQUENCE) {
325325
if (TII->get(MI.getOpcode()).TSFlags & R600_InstFlag::TEX_INST) {
326326
Register Reg = MI.getOperand(1).getReg();
327-
for (MachineRegisterInfo::def_instr_iterator
328-
It = MRI->def_instr_begin(Reg), E = MRI->def_instr_end();
329-
It != E; ++It) {
330-
RemoveMI(&(*It));
331-
}
327+
for (MachineInstr &DefMI : MRI->def_instructions(Reg))
328+
RemoveMI(&DefMI);
332329
}
333330
continue;
334331
}

llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,10 @@ void SIScheduleBlock::fastSchedule() {
287287
static bool isDefBetween(Register Reg, SlotIndex First, SlotIndex Last,
288288
const MachineRegisterInfo *MRI,
289289
const LiveIntervals *LIS) {
290-
for (MachineRegisterInfo::def_instr_iterator
291-
UI = MRI->def_instr_begin(Reg),
292-
UE = MRI->def_instr_end(); UI != UE; ++UI) {
293-
const MachineInstr* MI = &*UI;
294-
if (MI->isDebugValue())
290+
for (const MachineInstr &MI : MRI->def_instructions(Reg)) {
291+
if (MI.isDebugValue())
295292
continue;
296-
SlotIndex InstSlot = LIS->getInstructionIndex(*MI).getRegSlot();
293+
SlotIndex InstSlot = LIS->getInstructionIndex(MI).getRegSlot();
297294
if (InstSlot >= First && InstSlot <= Last)
298295
return true;
299296
}

llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,9 +4060,9 @@ SIRegisterInfo::getNumDefinedPhysRegs(const MachineRegisterInfo &MRI,
40604060
const TargetRegisterClass &RC) const {
40614061
for (MCPhysReg Reg : reverse(RC.getRegisters())) {
40624062
for (MCRegAliasIterator AI(Reg, this, true); AI.isValid(); ++AI) {
4063-
if (std::any_of(
4064-
MRI.def_instr_begin(*AI), MRI.def_instr_end(),
4065-
[](const MachineInstr &MI) { return !MI.isImplicitDef(); }))
4063+
if (llvm::any_of(MRI.def_instructions(*AI), [](const MachineInstr &MI) {
4064+
return !MI.isImplicitDef();
4065+
}))
40664066
return getHWRegIndex(Reg) + 1;
40674067
}
40684068
}

0 commit comments

Comments
 (0)