maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Teach the LiveInterval::join function to use the fast merge algorithm, 

generalizing its implementation sufficiently to support this value
number scenario as well.

This cuts out another significant performance hit in large functions
(over 10k basic blocks, etc), especially those with "natural" CFG
structures.

llvm-svn: 160026
This commit is contained in:
Chandler Carruth 2012-07-10 22:25:21 +00:00
parent 02638392c1
commit 2207f76cd4
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/CodeGen/LiveInterval.h
View File

@ -505,7 +505,7 @@ namespace llvm {
Ranges::iterator extendIntervalStartTo(Ranges::iterator I, SlotIndex NewStr);
void markValNoForDeletion(VNInfo *V);
void mergeIntervalRanges(const LiveInterval &RHS,
VNInfo *LHSValNo,
VNInfo *LHSValNo = 0,
const VNInfo *RHSValNo = 0);
LiveInterval& operator=(const LiveInterval& rhs); // DO NOT IMPLEMENT

31
llvm/lib/CodeGen/LiveInterval.cpp
View File

@ -450,14 +450,13 @@ void LiveInterval::join(LiveInterval &Other,
valnos.resize(NumNewVals); // shrinkify
// Okay, now insert the RHS live ranges into the LHS.
iterator InsertPos = begin();
unsigned RangeNo = 0;
for (iterator I = Other.begin(), E = Other.end(); I != E; ++I, ++RangeNo) {
// Map the valno in the other live range to the current live range.
I->valno = NewVNInfo[OtherAssignments[RangeNo]];
assert(I->valno && "Adding a dead range?");
InsertPos = addRangeFrom(*I, InsertPos);
}
mergeIntervalRanges(Other);
verify();
}
@ -467,8 +466,8 @@ void LiveInterval::join(LiveInterval &Other,
/// This is a helper routine implementing an efficient merge of another
/// LiveIntervals ranges into the current interval.
///
/// \param LHSValNo Set as the new value number for every range from RHS which
/// is merged into the LHS.
/// \param LHSValNo If non-NULL, set as the new value number for every range
/// from RHS which is merged into the LHS.
/// \param RHSValNo If non-NULL, then only ranges in RHS whose original value
/// number maches this value number will be merged into LHS.
void LiveInterval::mergeIntervalRanges(const LiveInterval &RHS,
@ -477,9 +476,10 @@ void LiveInterval::mergeIntervalRanges(const LiveInterval &RHS,
if (RHS.empty())
return;
// Ensure we're starting with valid ranges.
// Ensure we're starting with a valid range. Note that we don't verify RHS
// because it may have had its value numbers adjusted in preparation for
// merging.
verify();
RHS.verify();
// The strategy for merging these efficiently is as follows:
//
@ -529,7 +529,8 @@ void LiveInterval::mergeIntervalRanges(const LiveInterval &RHS,
if (*RI < R) {
R = *RI;
++RI;
R.valno = LHSValNo;
if (LHSValNo)
R.valno = LHSValNo;
} else {
++LI;
}
@ -578,14 +579,16 @@ void LiveInterval::mergeIntervalRanges(const LiveInterval &RHS,
ranges.insert(LI, NRI, NRE);
// And finally insert any trailing end of RHS (if we have one).
for (; RI != RE; ++RI)
for (; RI != RE; ++RI) {
LiveRange R = *RI;
if (LHSValNo)
R.valno = LHSValNo;
if (!ranges.empty() &&
ranges.back().valno == LHSValNo && RI->start <= ranges.back().end) {
ranges.back().end = std::max(ranges.back().end, RI->end);
} else {
ranges.push_back(*RI);
ranges.back().valno = LHSValNo;
}
ranges.back().valno == R.valno && R.start <= ranges.back().end)
ranges.back().end = std::max(ranges.back().end, R.end);
else
ranges.push_back(R);
}
// Ensure we finished with a valid new sequence of ranges.
verify();