Fix a quadratic algorithm in MachineBranchProbabilityInfo.

The getSumForBlock function was quadratic in the number of successors
because getSuccWeight would perform a linear search for an already known
iterator.

This patch was originally committed as r161460, but reverted again
because of assertion failures. Now that duplicate Machine CFG edges have
been eliminated, this works properly.

llvm-svn: 162233
This commit is contained in:
Jakob Stoklund Olesen
2012-08-20 22:01:38 +00:00
parent 517fdc7a2d
commit 6bae2a57d5
4 changed files with 23 additions and 13 deletions

View File

@@ -942,12 +942,11 @@ MachineBasicBlock::findDebugLoc(instr_iterator MBBI) {
/// getSuccWeight - Return weight of the edge from this block to MBB.
///
uint32_t MachineBasicBlock::getSuccWeight(const MachineBasicBlock *succ) const {
uint32_t MachineBasicBlock::getSuccWeight(const_succ_iterator Succ) const {
if (Weights.empty())
return 0;
const_succ_iterator I = std::find(Successors.begin(), Successors.end(), succ);
return *getWeightIterator(I);
return *getWeightIterator(Succ);
}
/// getWeightIterator - Return wight iterator corresonding to the I successor