RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-03-06 01:27:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow known and unknown probabilities coexist in MBB's successor list.

Browse Source 
Previously it is not allowed for each MBB to have successors with both known and
unknown probabilities. However, this may be too strict as at this stage we could
not always guarantee that. It is better to remove this restriction now, and I
will work on validating MBB's successors' probabilities first (for example,
check if the sum is approximate one).




git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254402 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Cong Hou 2015-12-01 11:05:39 +00:00
parent ce8e2a0d91
commit 1b91dc2235
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CodeGen/MachineBasicBlock.cpp
View File

@ -510,13 +510,8 @@ void MachineBasicBlock::addSuccessor(MachineBasicBlock *Succ,
BranchProbability Prob) {
// Probability list is either empty (if successor list isn't empty, this means
// disabled optimization) or has the same size as successor list.
if (!(Probs.empty() && !Successors.empty())) {
assert((Probs.empty() || (Prob.isUnknown() && Probs.back().isUnknown()) ||
(!Prob.isUnknown() && !Probs.back().isUnknown())) &&
"Successors with both known and unknwon probabilities are not "
"allowed.");
if (!(Probs.empty() && !Successors.empty()))
Probs.push_back(Prob);
}
Successors.push_back(Succ);
Succ->addPredecessor(this);
}
@ -1116,10 +1111,24 @@ MachineBasicBlock::findDebugLoc(instr_iterator MBBI) {
/// Return probability of the edge from this block to MBB.
BranchProbability
MachineBasicBlock::getSuccProbability(const_succ_iterator Succ) const {
if (Probs.empty() || Probs.back().isUnknown())
if (Probs.empty())
return BranchProbability(1, succ_size());
return *getProbabilityIterator(Succ);
const auto &Prob = *getProbabilityIterator(Succ);
if (Prob.isUnknown()) {
// For unknown probabilities, collect the sum of all known ones, and evenly
// ditribute the complemental of the sum to each unknown probability.
unsigned KnownProbNum = 0;
auto Sum = BranchProbability::getZero();
for (auto &P : Probs) {
if (!P.isUnknown()) {
Sum += P;
KnownProbNum++;
}
}
return Sum.getCompl() / (Probs.size() - KnownProbNum);
} else
return Prob;
}
/// Set successor probability of a given iterator.