Cache interval iterators in SplitEditor::addTruncSimpleRange so we only have to

do one find().

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115929 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2010-10-07 17:56:39 +00:00
parent 9b24afe41e
commit 4b3041c43e

View File

@ -736,30 +736,40 @@ void SplitEditor::closeIntv() {
void void
SplitEditor::addTruncSimpleRange(SlotIndex Start, SlotIndex End, VNInfo *VNI) { SplitEditor::addTruncSimpleRange(SlotIndex Start, SlotIndex End, VNInfo *VNI) {
SlotIndex sidx = Start; // Build vector of iterator pairs from the intervals.
typedef std::pair<LiveInterval::const_iterator,
LiveInterval::const_iterator> IIPair;
SmallVector<IIPair, 8> Iters;
for (int i = firstInterval, e = intervals_.size(); i != e; ++i) {
LiveInterval::const_iterator I = intervals_[i]->find(Start);
LiveInterval::const_iterator E = intervals_[i]->end();
if (I != E)
Iters.push_back(std::make_pair(I, E));
}
SlotIndex sidx = Start;
// Break [Start;End) into segments that don't overlap any intervals. // Break [Start;End) into segments that don't overlap any intervals.
for (;;) { for (;;) {
SlotIndex next = sidx, eidx = End; SlotIndex next = sidx, eidx = End;
// Find overlapping intervals. // Find overlapping intervals.
for (int i = firstInterval, e = intervals_.size(); i != e && sidx < eidx; for (unsigned i = 0; i != Iters.size() && sidx < eidx; ++i) {
++i) { LiveInterval::const_iterator I = Iters[i].first;
LiveInterval::const_iterator I = intervals_[i]->find(sidx);
LiveInterval::const_iterator E = intervals_[i]->end();
if (I == E)
continue;
// Interval I is overlapping [sidx;eidx). Trim sidx. // Interval I is overlapping [sidx;eidx). Trim sidx.
if (I->start <= sidx) { if (I->start <= sidx) {
sidx = I->end; sidx = I->end;
if (++I == E) // Move to the next run, remove iters when all are consumed.
I = ++Iters[i].first;
if (I == Iters[i].second) {
Iters.erase(Iters.begin() + i);
--i;
continue; continue;
}
} }
// Trim eidx too if needed. // Trim eidx too if needed.
if (I->start >= eidx) if (I->start >= eidx)
continue; continue;
eidx = I->start; eidx = I->start;
if (I->end > next) next = I->end;
next = I->end;
} }
// Now, [sidx;eidx) doesn't overlap anything in intervals_. // Now, [sidx;eidx) doesn't overlap anything in intervals_.
if (sidx < eidx) if (sidx < eidx)