if (BB->getTerminator()->getNumSuccessors() == 1)
return false;
- SmallVector<BasicBlock *, 4> ReturningEdges;
- SmallVector<BasicBlock *, 4> StayEdges;
+ SmallPtrSet<BasicBlock *, 4> ReturningEdges;
+ SmallPtrSet<BasicBlock *, 4> StayEdges;
for (succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
BasicBlock *Succ = *I;
if (isReturningBlock(Succ))
- ReturningEdges.push_back(Succ);
+ ReturningEdges.insert(Succ);
else
- StayEdges.push_back(Succ);
+ StayEdges.insert(Succ);
}
if (uint32_t numStayEdges = StayEdges.size()) {
if (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)
BP->setEdgeWeight(BB, *I, stayWeight);
}
uint32_t retWeight = RH_NONTAKEN_WEIGHT / numRetEdges;
if (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) {
BP->setEdgeWeight(BB, *I, retWeight);
}
if (!L)
return false;
- SmallVector<BasicBlock *, 8> BackEdges;
- SmallVector<BasicBlock *, 8> ExitingEdges;
- SmallVector<BasicBlock *, 8> InEdges; // Edges from header to the loop.
+ SmallPtrSet<BasicBlock *, 8> BackEdges;
+ SmallPtrSet<BasicBlock *, 8> ExitingEdges;
+ SmallPtrSet<BasicBlock *, 8> InEdges; // Edges from header to the loop.
bool isHeader = BB == L->getHeader();
BasicBlock *Succ = *I;
Loop *SuccL = LI->getLoopFor(Succ);
if (SuccL != L)
- ExitingEdges.push_back(Succ);
+ ExitingEdges.insert(Succ);
else if (Succ == L->getHeader())
- BackEdges.push_back(Succ);
+ BackEdges.insert(Succ);
else if (isHeader)
- InEdges.push_back(Succ);
+ InEdges.insert(Succ);
}
if (uint32_t numBackEdges = BackEdges.size()) {
if (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) {
BasicBlock *Back = *EI;
BP->setEdgeWeight(BB, Back, backWeight);
if (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) {
BasicBlock *Back = *EI;
BP->setEdgeWeight(BB, Back, inWeight);
if (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) {
BasicBlock *Exiting = *EI;
BP->setEdgeWeight(BB, Exiting, exitWeight);
Value *RHS = CI->getOperand(1);
ConstantInt *CV = dyn_cast<ConstantInt>(RHS);
- if (!CV || !CV->isZero())
+ if (!CV)
return false;
bool isProb;
- switch (CI->getPredicate()) {
- case CmpInst::ICMP_EQ:
- // Equal to zero is not expected to be taken.
- isProb = false;
- break;
-
- case CmpInst::ICMP_NE:
- // Not equal to zero is expected.
- isProb = true;
- break;
-
- case CmpInst::ICMP_ULT:
- case CmpInst::ICMP_ULE:
- case CmpInst::ICMP_SLT:
- case CmpInst::ICMP_SLE:
- // Less or equal to zero is not expected.
- // X < 0 -> Unlikely
- // X <= 0 -> Unlikely
+ if (CV->isZero()) {
+ switch (CI->getPredicate()) {
+ case CmpInst::ICMP_EQ:
+ // X == 0 -> Unlikely
+ isProb = false;
+ break;
+ case CmpInst::ICMP_NE:
+ // X != 0 -> Likely
+ isProb = true;
+ break;
+ case CmpInst::ICMP_SLT:
+ // X < 0 -> Unlikely
+ isProb = false;
+ break;
+ case CmpInst::ICMP_SGT:
+ // X > 0 -> Likely
+ isProb = true;
+ break;
+ default:
+ return false;
+ }
+ } else if (CV->isOne() && CI->getPredicate() == CmpInst::ICMP_SLT) {
+ // InstCombine canonicalizes X <= 0 into X < 1.
+ // X <= 0 -> Unlikely
isProb = false;
- break;
-
- case CmpInst::ICMP_UGT:
- case CmpInst::ICMP_UGE:
- case CmpInst::ICMP_SGT:
- case CmpInst::ICMP_SGE:
- // Greater or equal to zero is expected.
- // X > 0 -> Likely
- // X >= 0 -> Likely
+ } else if (CV->isAllOnesValue() && CI->getPredicate() == CmpInst::ICMP_SGT) {
+ // InstCombine canonicalizes X >= 0 into X > -1.
+ // X >= 0 -> Likely
isProb = true;
- break;
-
- default:
+ } else {
return false;
- };
+ }
BasicBlock *Taken = BI->getSuccessor(0);
BasicBlock *NonTaken = BI->getSuccessor(1);