diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-08-20 22:01:38 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-08-20 22:01:38 +0000 |
| commit | 990ca5517fd6666d4049b6b8281d9df99da11637 (patch) | |
| tree | eba24e2322ff7ca69f040973f3c5654ab03f3ae0 /lib/CodeGen/MachineBasicBlock.cpp | |
| parent | e7fdef420d0c8a825555d246da259342c48bd527 (diff) | |
| download | llvm-990ca5517fd6666d4049b6b8281d9df99da11637.tar.gz llvm-990ca5517fd6666d4049b6b8281d9df99da11637.tar.bz2 llvm-990ca5517fd6666d4049b6b8281d9df99da11637.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162233 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/MachineBasicBlock.cpp')
| -rw-r--r-- | lib/CodeGen/MachineBasicBlock.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp index fa6b4502c4..cf13dbdab6 100644 --- a/lib/CodeGen/MachineBasicBlock.cpp +++ b/lib/CodeGen/MachineBasicBlock.cpp @@ -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 |