AMDGPU: Remove implicit ilist iterator conversions, NFC
One of the changes in lib/Target/AMDGPU/AMDGPUMCInstLower.cpp was a new one. Previously, bundle iterators and single-instruction iterators could be compared to each other (comparing on underlying pointers). I changed a comparison from using `MBB->end()` to using `MBB->instr_end()`, since both end iterators should point at the some place anyway. I don't think the implicit conversion between the two iterator types is a good idea since it's fairly easy to accidentally compare to the wrong thing (they aren't always end iterators). Otherwise I would have just added the conversion. Even with that, no there should be functionality change here. llvm-svn: 250218
This commit is contained in:
parent
6b948d5efb
commit
a73371a9b7
|
@ -104,10 +104,9 @@ void AMDGPUAsmPrinter::EmitInstruction(const MachineInstr *MI) {
|
|||
#endif
|
||||
if (MI->isBundle()) {
|
||||
const MachineBasicBlock *MBB = MI->getParent();
|
||||
MachineBasicBlock::const_instr_iterator I = MI;
|
||||
++I;
|
||||
while (I != MBB->end() && I->isInsideBundle()) {
|
||||
EmitInstruction(I);
|
||||
MachineBasicBlock::const_instr_iterator I = ++MI->getIterator();
|
||||
while (I != MBB->instr_end() && I->isInsideBundle()) {
|
||||
EmitInstruction(&*I);
|
||||
++I;
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -77,7 +77,7 @@ bool AMDGPUPromoteAlloca::runOnFunction(Function &F) {
|
|||
// Check how much local memory is being used by global objects
|
||||
for (Module::global_iterator I = Mod->global_begin(),
|
||||
E = Mod->global_end(); I != E; ++I) {
|
||||
GlobalVariable *GV = I;
|
||||
GlobalVariable *GV = &*I;
|
||||
PointerType *GVTy = GV->getType();
|
||||
if (GVTy->getAddressSpace() != AMDGPUAS::LOCAL_ADDRESS)
|
||||
continue;
|
||||
|
|
|
@ -881,7 +881,7 @@ bool AMDGPUCFGStructurizer::run() {
|
|||
} //while, "one iteration" over the function.
|
||||
|
||||
MachineBasicBlock *EntryMBB =
|
||||
GraphTraits<MachineFunction *>::nodes_begin(FuncRep);
|
||||
&*GraphTraits<MachineFunction *>::nodes_begin(FuncRep);
|
||||
if (EntryMBB->succ_size() == 0) {
|
||||
Finish = true;
|
||||
DEBUG(
|
||||
|
@ -904,7 +904,7 @@ bool AMDGPUCFGStructurizer::run() {
|
|||
} while (!Finish && MakeProgress);
|
||||
|
||||
// Misc wrap up to maintain the consistency of the Function representation.
|
||||
wrapup(GraphTraits<MachineFunction *>::nodes_begin(FuncRep));
|
||||
wrapup(&*GraphTraits<MachineFunction *>::nodes_begin(FuncRep));
|
||||
|
||||
// Detach retired Block, release memory.
|
||||
for (MBBInfoMap::iterator It = BlockInfoMap.begin(), E = BlockInfoMap.end();
|
||||
|
|
|
@ -405,8 +405,8 @@ private:
|
|||
if (MO.isReg() && MO.isInternalRead())
|
||||
MO.setIsInternalRead(false);
|
||||
}
|
||||
getLiteral(BI, Literals);
|
||||
ClauseContent.push_back(BI);
|
||||
getLiteral(&*BI, Literals);
|
||||
ClauseContent.push_back(&*BI);
|
||||
}
|
||||
I = BI;
|
||||
DeleteMI->eraseFromParent();
|
||||
|
|
|
@ -318,7 +318,7 @@ bool R600VectorRegMerger::runOnMachineFunction(MachineFunction &Fn) {
|
|||
MRI = &(Fn.getRegInfo());
|
||||
for (MachineFunction::iterator MBB = Fn.begin(), MBBe = Fn.end();
|
||||
MBB != MBBe; ++MBB) {
|
||||
MachineBasicBlock *MB = MBB;
|
||||
MachineBasicBlock *MB = &*MBB;
|
||||
PreviousRegSeq.clear();
|
||||
PreviousRegSeqByReg.clear();
|
||||
PreviousRegSeqByUndefCount.clear();
|
||||
|
|
|
@ -81,11 +81,11 @@ private:
|
|||
int LastDstChan = -1;
|
||||
do {
|
||||
bool isTrans = false;
|
||||
int BISlot = getSlot(BI);
|
||||
int BISlot = getSlot(&*BI);
|
||||
if (LastDstChan >= BISlot)
|
||||
isTrans = true;
|
||||
LastDstChan = BISlot;
|
||||
if (TII->isPredicated(BI))
|
||||
if (TII->isPredicated(&*BI))
|
||||
continue;
|
||||
int OperandIdx = TII->getOperandIdx(BI->getOpcode(), AMDGPU::OpName::write);
|
||||
if (OperandIdx > -1 && BI->getOperand(OperandIdx).getImm() == 0)
|
||||
|
@ -95,7 +95,7 @@ private:
|
|||
continue;
|
||||
}
|
||||
unsigned Dst = BI->getOperand(DstIdx).getReg();
|
||||
if (isTrans || TII->isTransOnly(BI)) {
|
||||
if (isTrans || TII->isTransOnly(&*BI)) {
|
||||
Result[Dst] = AMDGPU::PS;
|
||||
continue;
|
||||
}
|
||||
|
@ -375,7 +375,7 @@ bool R600Packetizer::runOnMachineFunction(MachineFunction &Fn) {
|
|||
// instruction stream until we find the nearest boundary.
|
||||
MachineBasicBlock::iterator I = RegionEnd;
|
||||
for(;I != MBB->begin(); --I, --RemainingCount) {
|
||||
if (TII->isSchedulingBoundary(std::prev(I), MBB, Fn))
|
||||
if (TII->isSchedulingBoundary(&*std::prev(I), &*MBB, Fn))
|
||||
break;
|
||||
}
|
||||
I = MBB->begin();
|
||||
|
@ -392,7 +392,7 @@ bool R600Packetizer::runOnMachineFunction(MachineFunction &Fn) {
|
|||
continue;
|
||||
}
|
||||
|
||||
Packetizer.PacketizeMIs(MBB, I, RegionEnd);
|
||||
Packetizer.PacketizeMIs(&*MBB, &*I, RegionEnd);
|
||||
RegionEnd = I;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -315,7 +315,7 @@ void SIAnnotateControlFlow::closeControlFlow(BasicBlock *BB) {
|
|||
BB = llvm::SplitBlockPredecessors(BB, Preds, "endcf.split", DT, LI, false);
|
||||
}
|
||||
|
||||
CallInst::Create(EndCf, popSaved(), "", BB->getFirstInsertionPt());
|
||||
CallInst::Create(EndCf, popSaved(), "", &*BB->getFirstInsertionPt());
|
||||
}
|
||||
|
||||
/// \brief Annotate the control flow with intrinsics so the backend can
|
||||
|
|
|
@ -119,7 +119,7 @@ bool SIFixSGPRLiveRanges::runOnMachineFunction(MachineFunction &MF) {
|
|||
SmallVector<unsigned, 16> SGPRLiveRanges;
|
||||
|
||||
LiveVariables *LV = &getAnalysis<LiveVariables>();
|
||||
MachineBasicBlock *Entry = MF.begin();
|
||||
MachineBasicBlock *Entry = &MF.front();
|
||||
|
||||
// Use a depth first order so that in SSA, we encounter all defs before
|
||||
// uses. Once the defs of the block have been found, attempt to insert
|
||||
|
|
|
@ -68,7 +68,7 @@ bool SIPrepareScratchRegs::runOnMachineFunction(MachineFunction &MF) {
|
|||
const SIRegisterInfo *TRI = &TII->getRegisterInfo();
|
||||
MachineRegisterInfo &MRI = MF.getRegInfo();
|
||||
MachineFrameInfo *FrameInfo = MF.getFrameInfo();
|
||||
MachineBasicBlock *Entry = MF.begin();
|
||||
MachineBasicBlock *Entry = &MF.front();
|
||||
MachineBasicBlock::iterator I = Entry->begin();
|
||||
DebugLoc DL = I->getDebugLoc();
|
||||
|
||||
|
|
Loading…
Reference in New Issue