diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-04-25 04:38:06 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-04-25 04:38:06 +0000 |
commit | 7e26181f6bbbf0868ad32b8fda2d07020bb28a95 (patch) | |
tree | 5d0307dce697f7d1bc25ef37cac2dfdf2347f415 /lib | |
parent | 625063d49562ccac4572f19ca4bb479f79403e75 (diff) | |
download | llvm-7e26181f6bbbf0868ad32b8fda2d07020bb28a95.tar.gz llvm-7e26181f6bbbf0868ad32b8fda2d07020bb28a95.tar.bz2 llvm-7e26181f6bbbf0868ad32b8fda2d07020bb28a95.tar.xz |
blockfreq: Encapsulate LoopData::Header
<rdar://problem/14292693>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207181 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Analysis/BlockFrequencyInfoImpl.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/lib/Analysis/BlockFrequencyInfoImpl.cpp b/lib/Analysis/BlockFrequencyInfoImpl.cpp index 8476eadbda..90090d7e8f 100644 --- a/lib/Analysis/BlockFrequencyInfoImpl.cpp +++ b/lib/Analysis/BlockFrequencyInfoImpl.cpp @@ -660,15 +660,15 @@ void BlockFrequencyInfoImplBase::addToDist(Distribution &Dist, if (!Weight) Weight = 1; - BlockNode LoopHead; - if (OuterLoop) - LoopHead = OuterLoop->Header; + auto isLoopHeader = [&OuterLoop](const BlockNode &Node) { + return OuterLoop && OuterLoop->isHeader(Node); + }; #ifndef NDEBUG auto debugSuccessor = [&](const char *Type, const BlockNode &Resolved) { dbgs() << " =>" << " [" << Type << "] weight = " << Weight; - if (Succ != LoopHead) + if (!isLoopHeader(Succ)) dbgs() << ", succ = " << getBlockName(Succ); if (Resolved != Succ) dbgs() << ", resolved = " << getBlockName(Resolved); @@ -677,15 +677,15 @@ void BlockFrequencyInfoImplBase::addToDist(Distribution &Dist, (void)debugSuccessor; #endif - if (Succ == LoopHead) { + if (isLoopHeader(Succ)) { DEBUG(debugSuccessor("backedge", Succ)); - Dist.addBackedge(LoopHead, Weight); + Dist.addBackedge(OuterLoop->getHeader(), Weight); return; } BlockNode Resolved = getPackagedNode(*this, Succ); - assert(Resolved != LoopHead); + assert(!isLoopHeader(Resolved)); - if (Working[Resolved.Index].getContainingHeader() != LoopHead) { + if (Working[Resolved.Index].getContainingLoop() != OuterLoop) { DEBUG(debugSuccessor(" exit ", Resolved)); Dist.addExit(Resolved, Weight); return; @@ -705,7 +705,7 @@ void BlockFrequencyInfoImplBase::addLoopSuccessorsToDist( const LoopData *OuterLoop, LoopData &Loop, Distribution &Dist) { // Copy the exit map into Dist. for (const auto &I : Loop.Exits) - addToDist(Dist, OuterLoop, Loop.Header, I.first, I.second.getMass()); + addToDist(Dist, OuterLoop, Loop.getHeader(), I.first, I.second.getMass()); // We don't need this map any more. Clear it to prevent quadratic memory // usage in deeply nested loops with irreducible control flow. @@ -721,7 +721,8 @@ static Float getMaxLoopScale() { return Float(1, 12); } /// \brief Compute the loop scale for a loop. void BlockFrequencyInfoImplBase::computeLoopScale(LoopData &Loop) { // Compute loop scale. - DEBUG(dbgs() << "compute-loop-scale: " << getBlockName(Loop.Header) << "\n"); + DEBUG(dbgs() << "compute-loop-scale: " << getBlockName(Loop.getHeader()) + << "\n"); // LoopScale == 1 / ExitMass // ExitMass == HeadMass - BackedgeMass @@ -742,7 +743,7 @@ void BlockFrequencyInfoImplBase::computeLoopScale(LoopData &Loop) { /// \brief Package up a loop. void BlockFrequencyInfoImplBase::packageLoop(LoopData &Loop) { - DEBUG(dbgs() << "packaging-loop: " << getBlockName(Loop.Header) << "\n"); + DEBUG(dbgs() << "packaging-loop: " << getBlockName(Loop.getHeader()) << "\n"); Loop.IsPackaged = true; DEBUG(for (const BlockNode &M : Loop.Members) { @@ -774,9 +775,6 @@ void BlockFrequencyInfoImplBase::distributeMass(const BlockNode &Source, (void)debugAssign; #endif - BlockNode LoopHead; - if (OuterLoop) - LoopHead = OuterLoop->Header; for (const Weight &W : Dist.Weights) { // Check for a local edge (forward and non-exit). if (W.Type == Weight::Local) { |