6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Change SmallVector to SmallPtrSet in BranchProbabilityInfo. Handle cases where

Browse Source 
one than one successor goes to the same block.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136638 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakub Staszak 2011-08-01 19:16:26 +00:00
parent 7f76baed5e
commit b137f16936
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Analysis/BranchProbabilityInfo.cpp
View File

@ -142,15 +142,15 @@ bool BranchProbabilityAnalysis::calcReturnHeuristics(BasicBlock *BB){
if (BB->getTerminator()->getNumSuccessors() == 1) if (BB->getTerminator()->getNumSuccessors() == 1)
return false; return false;
SmallVector<BasicBlock *, 4> ReturningEdges; SmallPtrSet<BasicBlock *, 4> ReturningEdges;
SmallVector<BasicBlock *, 4> StayEdges; SmallPtrSet<BasicBlock *, 4> StayEdges;
for (succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { for (succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
BasicBlock *Succ = *I; BasicBlock *Succ = *I;
if (isReturningBlock(Succ)) if (isReturningBlock(Succ))
ReturningEdges.push_back(Succ); ReturningEdges.insert(Succ);
else else
StayEdges.push_back(Succ); StayEdges.insert(Succ);
} }
if (uint32_t numStayEdges = StayEdges.size()) { if (uint32_t numStayEdges = StayEdges.size()) {
@ -158,7 +158,7 @@ bool BranchProbabilityAnalysis::calcReturnHeuristics(BasicBlock *BB){
if (stayWeight < NORMAL_WEIGHT) if (stayWeight < NORMAL_WEIGHT)
stayWeight = NORMAL_WEIGHT; stayWeight = NORMAL_WEIGHT;
for (SmallVector<BasicBlock *, 4>::iterator I = StayEdges.begin(), for (SmallPtrSet<BasicBlock *, 4>::iterator I = StayEdges.begin(),
E = StayEdges.end(); I != E; ++I) E = StayEdges.end(); I != E; ++I)
BP->setEdgeWeight(BB, *I, stayWeight); BP->setEdgeWeight(BB, *I, stayWeight);
} }
@ -167,7 +167,7 @@ bool BranchProbabilityAnalysis::calcReturnHeuristics(BasicBlock *BB){
uint32_t retWeight = RH_NONTAKEN_WEIGHT / numRetEdges; uint32_t retWeight = RH_NONTAKEN_WEIGHT / numRetEdges;
if (retWeight < MIN_WEIGHT) if (retWeight < MIN_WEIGHT)
retWeight = MIN_WEIGHT; retWeight = MIN_WEIGHT;
for (SmallVector<BasicBlock *, 4>::iterator I = ReturningEdges.begin(), for (SmallPtrSet<BasicBlock *, 4>::iterator I = ReturningEdges.begin(),
E = ReturningEdges.end(); I != E; ++I) { E = ReturningEdges.end(); I != E; ++I) {
BP->setEdgeWeight(BB, *I, retWeight); BP->setEdgeWeight(BB, *I, retWeight);
} }
@ -220,9 +220,9 @@ bool BranchProbabilityAnalysis::calcLoopBranchHeuristics(BasicBlock *BB) {
if (!L) if (!L)
return false; return false;
SmallVector<BasicBlock *, 8> BackEdges; SmallPtrSet<BasicBlock *, 8> BackEdges;
SmallVector<BasicBlock *, 8> ExitingEdges; SmallPtrSet<BasicBlock *, 8> ExitingEdges;
SmallVector<BasicBlock *, 8> InEdges; // Edges from header to the loop. SmallPtrSet<BasicBlock *, 8> InEdges; // Edges from header to the loop.
bool isHeader = BB == L->getHeader(); bool isHeader = BB == L->getHeader();
@ -230,11 +230,11 @@ bool BranchProbabilityAnalysis::calcLoopBranchHeuristics(BasicBlock *BB) {
BasicBlock *Succ = *I; BasicBlock *Succ = *I;
Loop *SuccL = LI->getLoopFor(Succ); Loop *SuccL = LI->getLoopFor(Succ);
if (SuccL != L) if (SuccL != L)
ExitingEdges.push_back(Succ); ExitingEdges.insert(Succ);
else if (Succ == L->getHeader()) else if (Succ == L->getHeader())
BackEdges.push_back(Succ); BackEdges.insert(Succ);
else if (isHeader) else if (isHeader)
InEdges.push_back(Succ); InEdges.insert(Succ);
} }
if (uint32_t numBackEdges = BackEdges.size()) { if (uint32_t numBackEdges = BackEdges.size()) {
@ -242,7 +242,7 @@ bool BranchProbabilityAnalysis::calcLoopBranchHeuristics(BasicBlock *BB) {
if (backWeight < NORMAL_WEIGHT) if (backWeight < NORMAL_WEIGHT)
backWeight = NORMAL_WEIGHT; backWeight = NORMAL_WEIGHT;
for (SmallVector<BasicBlock *, 8>::iterator EI = BackEdges.begin(), for (SmallPtrSet<BasicBlock *, 8>::iterator EI = BackEdges.begin(),
EE = BackEdges.end(); EI != EE; ++EI) { EE = BackEdges.end(); EI != EE; ++EI) {
BasicBlock *Back = *EI; BasicBlock *Back = *EI;
BP->setEdgeWeight(BB, Back, backWeight); BP->setEdgeWeight(BB, Back, backWeight);
@ -254,7 +254,7 @@ bool BranchProbabilityAnalysis::calcLoopBranchHeuristics(BasicBlock *BB) {
if (inWeight < NORMAL_WEIGHT) if (inWeight < NORMAL_WEIGHT)
inWeight = NORMAL_WEIGHT; inWeight = NORMAL_WEIGHT;
for (SmallVector<BasicBlock *, 8>::iterator EI = InEdges.begin(), for (SmallPtrSet<BasicBlock *, 8>::iterator EI = InEdges.begin(),
EE = InEdges.end(); EI != EE; ++EI) { EE = InEdges.end(); EI != EE; ++EI) {
BasicBlock *Back = *EI; BasicBlock *Back = *EI;
BP->setEdgeWeight(BB, Back, inWeight); BP->setEdgeWeight(BB, Back, inWeight);
@ -267,7 +267,7 @@ bool BranchProbabilityAnalysis::calcLoopBranchHeuristics(BasicBlock *BB) {
if (exitWeight < MIN_WEIGHT) if (exitWeight < MIN_WEIGHT)
exitWeight = MIN_WEIGHT; exitWeight = MIN_WEIGHT;
for (SmallVector<BasicBlock *, 8>::iterator EI = ExitingEdges.begin(), for (SmallPtrSet<BasicBlock *, 8>::iterator EI = ExitingEdges.begin(),
EE = ExitingEdges.end(); EI != EE; ++EI) { EE = ExitingEdges.end(); EI != EE; ++EI) {
BasicBlock *Exiting = *EI; BasicBlock *Exiting = *EI;
BP->setEdgeWeight(BB, Exiting, exitWeight); BP->setEdgeWeight(BB, Exiting, exitWeight);