Skip to content

Commit 78505ad

Browse files
[AMDGPU] Use range-based for loops (NFC) (#106184)
1 parent 3d2fd31 commit 78505ad

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

llvm/lib/Target/AMDGPU/R600EmitClauseMarkers.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,8 @@ class R600EmitClauseMarkers : public MachineFunctionPass {
180180
MachineBasicBlock::iterator BBEnd) {
181181
const R600RegisterInfo &TRI = TII->getRegisterInfo();
182182
//TODO: change this to defs?
183-
for (MachineInstr::const_mop_iterator
184-
MOI = Def->operands_begin(),
185-
MOE = Def->operands_end(); MOI != MOE; ++MOI) {
186-
if (!MOI->isReg() || !MOI->isDef() ||
187-
TRI.isPhysRegLiveAcrossClauses(MOI->getReg()))
183+
for (MachineOperand &MO : Def->all_defs()) {
184+
if (TRI.isPhysRegLiveAcrossClauses(MO.getReg()))
188185
continue;
189186

190187
// Def defines a clause local register, so check that its use will fit
@@ -208,11 +205,11 @@ class R600EmitClauseMarkers : public MachineFunctionPass {
208205
// occur in the same basic block as its definition, because
209206
// it is illegal for the scheduler to schedule them in
210207
// different blocks.
211-
if (UseI->readsRegister(MOI->getReg(), &TRI))
208+
if (UseI->readsRegister(MO.getReg(), &TRI))
212209
LastUseCount = AluInstCount;
213210

214211
// Exit early if the current use kills the register
215-
if (UseI != Def && UseI->killsRegister(MOI->getReg(), &TRI))
212+
if (UseI != Def && UseI->killsRegister(MO.getReg(), &TRI))
216213
break;
217214
}
218215
if (LastUseCount)

llvm/lib/Target/AMDGPU/R600MachineScheduler.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,9 @@ void R600SchedStrategy::AssignSlot(MachineInstr* MI, unsigned Slot) {
350350
Register DestReg = MI->getOperand(DstIndex).getReg();
351351
// PressureRegister crashes if an operand is def and used in the same inst
352352
// and we try to constraint its regclass
353-
for (MachineInstr::mop_iterator It = MI->operands_begin(),
354-
E = MI->operands_end(); It != E; ++It) {
355-
MachineOperand &MO = *It;
356-
if (MO.isReg() && !MO.isDef() &&
357-
MO.getReg() == DestReg)
353+
for (const MachineOperand &MO : MI->all_uses())
354+
if (MO.getReg() == DestReg)
358355
return;
359-
}
360356
// Constrains the regclass of DestReg to assign it to Slot
361357
switch (Slot) {
362358
case 0:

llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,8 @@ void WaitcntBrackets::updateByEvent(const SIInstrInfo *TII,
883883
// can be used as the actual source after export patching, so
884884
// we need to treat them like sources and set the EXP_CNT
885885
// score.
886-
for (unsigned I = 0, E = Inst.getNumOperands(); I != E; ++I) {
887-
MachineOperand &DefMO = Inst.getOperand(I);
888-
if (DefMO.isReg() && DefMO.isDef() &&
889-
TRI->isVGPR(*MRI, DefMO.getReg())) {
886+
for (MachineOperand &DefMO : Inst.all_defs()) {
887+
if (TRI->isVGPR(*MRI, DefMO.getReg())) {
890888
setRegScore(
891889
TRI->getEncodingValue(AMDGPU::getMCReg(DefMO.getReg(), *ST)),
892890
EXP_CNT, CurrScore);

0 commit comments

Comments
 (0)