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

SlotIndexes: simplify IdxMBBPair operators 

llvm-svn: 364152
This commit is contained in:
Fangrui Song 2019-06-23 13:16:03 +00:00
parent 6ddc7912b0
commit 6620e3b2f6
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/include/llvm/CodeGen/SlotIndexes.h
View File

@ -308,20 +308,6 @@ class raw_ostream;
using IdxMBBPair = std::pair<SlotIndex, MachineBasicBlock *>; using IdxMBBPair = std::pair<SlotIndex, MachineBasicBlock *>;
inline bool operator<(SlotIndex V, const IdxMBBPair &IM) {
return V < IM.first;
}
inline bool operator<(const IdxMBBPair &IM, SlotIndex V) {
return IM.first < V;
}
struct Idx2MBBCompare {
bool operator()(const IdxMBBPair &LHS, const IdxMBBPair &RHS) const {
return LHS.first < RHS.first;
}
};
/// SlotIndexes pass. /// SlotIndexes pass.
/// ///
/// This pass assigns indexes to each instruction. /// This pass assigns indexes to each instruction.
@ -513,7 +499,8 @@ class raw_ostream;
/// Move iterator to the next IdxMBBPair where the SlotIndex is greater or /// Move iterator to the next IdxMBBPair where the SlotIndex is greater or
/// equal to \p To. /// equal to \p To.
MBBIndexIterator advanceMBBIndex(MBBIndexIterator I, SlotIndex To) const { MBBIndexIterator advanceMBBIndex(MBBIndexIterator I, SlotIndex To) const {
return std::lower_bound(I, idx2MBBMap.end(), To); return llvm::bsearch(I, idx2MBBMap.end(),
[=](const IdxMBBPair &IM) { return To <= IM.first; });
} }
/// Get an iterator pointing to the IdxMBBPair with the biggest SlotIndex /// Get an iterator pointing to the IdxMBBPair with the biggest SlotIndex
@ -677,7 +664,7 @@ class raw_ostream;
idx2MBBMap.push_back(IdxMBBPair(startIdx, mbb)); idx2MBBMap.push_back(IdxMBBPair(startIdx, mbb));
renumberIndexes(newItr); renumberIndexes(newItr);
llvm::sort(idx2MBBMap, Idx2MBBCompare()); llvm::sort(idx2MBBMap, less_first());
} }
/// Free the resources that were required to maintain a SlotIndex. /// Free the resources that were required to maintain a SlotIndex.

2
llvm/lib/CodeGen/SlotIndexes.cpp
View File

@ -94,7 +94,7 @@ bool SlotIndexes::runOnMachineFunction(MachineFunction &fn) {
} }
// Sort the Idx2MBBMap // Sort the Idx2MBBMap
llvm::sort(idx2MBBMap, Idx2MBBCompare()); llvm::sort(idx2MBBMap, less_first());
LLVM_DEBUG(mf->print(dbgs(), this)); LLVM_DEBUG(mf->print(dbgs(), this));