Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/IceCfg.cpp

Issue 619893002: Subzero: Auto-awesome iterators. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Make some iterator element names more uniform Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/IceCfgNode.cpp » ('j') | src/IceConverter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceCfg.cpp
diff --git a/src/IceCfg.cpp b/src/IceCfg.cpp
index d2c83ab43144dd3a3f6803d22e65db77e2b460b4..730a893425589009e8df5c5178209346072e5b98 100644
--- a/src/IceCfg.cpp
+++ b/src/IceCfg.cpp
@@ -82,9 +82,8 @@ void Cfg::translate() {
}
void Cfg::computePredecessors() {
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->computePredecessors();
- }
+ for (auto &Node : Nodes)
JF 2014/10/01 16:21:00 for (Node *N : Nodes)
Jim Stichnoth 2014/10/01 19:15:07 Done.
+ Node->computePredecessors();
}
void Cfg::renumberInstructions() {
@@ -92,18 +91,16 @@ void Cfg::renumberInstructions() {
GlobalContext::getTimerID("renumberInstructions");
TimerMarker T(IDrenumberInstructions, getContext());
NextInstNumber = 1;
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->renumberInstructions();
- }
+ for (auto &Node : Nodes)
+ Node->renumberInstructions();
}
// placePhiLoads() must be called before placePhiStores().
void Cfg::placePhiLoads() {
static TimerIdT IDplacePhiLoads = GlobalContext::getTimerID("placePhiLoads");
TimerMarker T(IDplacePhiLoads, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->placePhiLoads();
- }
+ for (auto &Node : Nodes)
+ Node->placePhiLoads();
}
// placePhiStores() must be called after placePhiLoads().
@@ -111,17 +108,15 @@ void Cfg::placePhiStores() {
static TimerIdT IDplacePhiStores =
GlobalContext::getTimerID("placePhiStores");
TimerMarker T(IDplacePhiStores, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->placePhiStores();
- }
+ for (auto &Node : Nodes)
+ Node->placePhiStores();
}
void Cfg::deletePhis() {
static TimerIdT IDdeletePhis = GlobalContext::getTimerID("deletePhis");
TimerMarker T(IDdeletePhis, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->deletePhis();
- }
+ for (auto &Node : Nodes)
+ Node->deletePhis();
}
void Cfg::doArgLowering() {
@@ -133,26 +128,23 @@ void Cfg::doArgLowering() {
void Cfg::doAddressOpt() {
static TimerIdT IDdoAddressOpt = GlobalContext::getTimerID("doAddressOpt");
TimerMarker T(IDdoAddressOpt, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->doAddressOpt();
- }
+ for (auto &Node : Nodes)
+ Node->doAddressOpt();
}
void Cfg::doNopInsertion() {
static TimerIdT IDdoNopInsertion =
GlobalContext::getTimerID("doNopInsertion");
TimerMarker T(IDdoNopInsertion, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->doNopInsertion();
- }
+ for (auto &Node : Nodes)
+ Node->doNopInsertion();
}
void Cfg::genCode() {
static TimerIdT IDgenCode = GlobalContext::getTimerID("genCode");
TimerMarker T(IDgenCode, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->genCode();
- }
+ for (auto &Node : Nodes)
+ Node->genCode();
}
// Compute the stack frame layout.
@@ -163,11 +155,9 @@ void Cfg::genFrame() {
// TODO: Consider folding epilog generation into the final
// emission/assembly pass to avoid an extra iteration over the node
// list. Or keep a separate list of exit nodes.
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- CfgNode *Node = *I;
+ for (auto &Node : Nodes)
if (Node->getHasReturn())
getTarget()->addEpilog(Node);
- }
}
// This is a lightweight version of live-range-end calculation. Marks
@@ -179,9 +169,8 @@ void Cfg::livenessLightweight() {
GlobalContext::getTimerID("livenessLightweight");
TimerMarker T(IDlivenessLightweight, getContext());
getVMetadata()->init();
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->livenessLightweight();
- }
+ for (auto &Node : Nodes)
+ Node->livenessLightweight();
}
void Cfg::liveness(LivenessMode Mode) {
@@ -194,8 +183,7 @@ void Cfg::liveness(LivenessMode Mode) {
llvm::BitVector NeedToProcess(Nodes.size(), true);
while (NeedToProcess.any()) {
// Iterate in reverse topological order to speed up convergence.
- for (NodeList::reverse_iterator I = Nodes.rbegin(), E = Nodes.rend();
- I != E; ++I) {
+ for (auto I = Nodes.rbegin(), E = Nodes.rend(); I != E; ++I) {
JF 2014/10/01 16:21:00 LLVM has include/llvm/ADT/iterator_range.h which s
Jim Stichnoth 2014/10/01 19:15:07 Added TODOs to add this after the LLVM 3.5 merge.
CfgNode *Node = *I;
if (NeedToProcess[Node->getIndex()]) {
NeedToProcess[Node->getIndex()] = false;
@@ -204,23 +192,16 @@ void Cfg::liveness(LivenessMode Mode) {
// If the beginning-of-block liveness changed since the last
// iteration, mark all in-edges as needing to be processed.
const NodeList &InEdges = Node->getInEdges();
- for (NodeList::const_iterator I1 = InEdges.begin(),
- E1 = InEdges.end();
- I1 != E1; ++I1) {
- CfgNode *Pred = *I1;
+ for (auto &Pred : InEdges)
NeedToProcess[Pred->getIndex()] = true;
- }
}
}
}
}
if (Mode == Liveness_Intervals) {
// Reset each variable's live range.
- for (VarList::const_iterator I = Variables.begin(), E = Variables.end();
- I != E; ++I) {
- if (Variable *Var = *I)
- Var->resetLiveRange();
- }
+ for (auto &Var : Variables)
+ Var->resetLiveRange();
}
// Collect timing for just the portion that constructs the live
// range intervals based on the end-of-live-range computation, for a
@@ -229,9 +210,8 @@ void Cfg::liveness(LivenessMode Mode) {
// and build each Variable's live range.
static TimerIdT IDliveRange = GlobalContext::getTimerID("liveRange");
TimerMarker T1(IDliveRange, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- (*I)->livenessPostprocess(Mode, getLiveness());
- }
+ for (auto &Node : Nodes)
+ Node->livenessPostprocess(Mode, getLiveness());
if (Mode == Liveness_Intervals) {
// Special treatment for live in-args. Their liveness needs to
// extend beyond the beginning of the function, otherwise an arg
@@ -280,13 +260,8 @@ bool Cfg::validateLiveness() const {
TimerMarker T(IDvalidateLiveness, getContext());
bool Valid = true;
Ostream &Str = Ctx->getStrDump();
- for (NodeList::const_iterator I1 = Nodes.begin(), E1 = Nodes.end(); I1 != E1;
- ++I1) {
- CfgNode *Node = *I1;
- InstList &Insts = Node->getInsts();
- for (InstList::const_iterator I2 = Insts.begin(), E2 = Insts.end();
- I2 != E2; ++I2) {
- Inst *Inst = *I2;
+ for (auto &Node : Nodes) {
+ for (auto &Inst : Node->getInsts()) {
if (Inst->isDeleted())
continue;
if (llvm::isa<InstFakeKill>(Inst))
@@ -327,8 +302,8 @@ bool Cfg::validateLiveness() const {
void Cfg::doBranchOpt() {
static TimerIdT IDdoBranchOpt = GlobalContext::getTimerID("doBranchOpt");
TimerMarker T(IDdoBranchOpt, getContext());
- for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
- NodeList::iterator NextNode = I;
+ for (auto I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
JF 2014/10/01 16:21:00 Range?
Jim Stichnoth 2014/10/01 19:15:07 I don't think so, because CfgNode::doBranchOpt() b
+ auto NextNode = I;
++NextNode;
(*I)->doBranchOpt(NextNode == E ? NULL : *NextNode);
}
@@ -360,16 +335,11 @@ void Cfg::emit() {
Str << "\t.type\t" << MangledName << ",@function\n";
}
Str << "\t.p2align " << getTarget()->getBundleAlignLog2Bytes() << ",0x";
- llvm::ArrayRef<uint8_t> Pad = getTarget()->getNonExecBundlePadding();
- for (llvm::ArrayRef<uint8_t>::iterator I = Pad.begin(), E = Pad.end();
- I != E; ++I) {
- Str.write_hex(*I);
- }
+ for (auto &I : getTarget()->getNonExecBundlePadding())
+ Str.write_hex(I);
Str << "\n";
- for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
- ++I) {
- (*I)->emit(this);
- }
+ for (auto &Node : Nodes)
+ Node->emit(this);
Str << "\n";
}
@@ -398,9 +368,7 @@ void Cfg::dump(const IceString &Message) {
resetCurrentNode();
if (getContext()->isVerbose(IceV_Liveness)) {
// Print summary info about variables
- for (VarList::const_iterator I = Variables.begin(), E = Variables.end();
- I != E; ++I) {
- Variable *Var = *I;
+ for (auto &Var : Variables) {
Str << "// multiblock=";
if (getVMetadata()->isTracked(Var))
Str << getVMetadata()->isMultiBlock(Var);
@@ -412,13 +380,10 @@ void Cfg::dump(const IceString &Message) {
}
}
// Print each basic block
- for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
- ++I) {
- (*I)->dump(this);
- }
- if (getContext()->isVerbose(IceV_Instructions)) {
+ for (auto &Node : Nodes)
+ Node->dump(this);
+ if (getContext()->isVerbose(IceV_Instructions))
Str << "}\n";
- }
}
} // end of namespace Ice
« no previous file with comments | « no previous file | src/IceCfgNode.cpp » ('j') | src/IceConverter.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698