RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-14 05:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MBP] method interface cleanup

Browse Source 
Make worklist and ehworklist member of the
class so that they don't need to be passed around.




git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274333 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Xinliang David Li 2016-07-01 05:46:48 +00:00
parent c48ea44111
commit 036eb7c125
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/CodeGen/MachineBlockPlacement.cpp
View File

@ -237,6 +237,10 @@ class MachineBlockPlacement : public MachineFunctionPass {
/// \brief A typedef for a block filter set. /// \brief A typedef for a block filter set.
typedef SmallPtrSet<MachineBasicBlock *, 16> BlockFilterSet; typedef SmallPtrSet<MachineBasicBlock *, 16> BlockFilterSet;
/// \brief work lists of blocks that are ready to be laid out
SmallVector<MachineBasicBlock *, 16> BlockWorkList;
SmallVector<MachineBasicBlock *, 16> EHPadWorkList;
/// \brief Machine Function /// \brief Machine Function
MachineFunction *F; MachineFunction *F;
@ -280,8 +284,6 @@ class MachineBlockPlacement : public MachineFunctionPass {
DenseMap<MachineBasicBlock *, BlockChain *> BlockToChain; DenseMap<MachineBasicBlock *, BlockChain *> BlockToChain;
void markChainSuccessors(BlockChain &Chain, MachineBasicBlock *LoopHeaderBB, void markChainSuccessors(BlockChain &Chain, MachineBasicBlock *LoopHeaderBB,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter = nullptr); const BlockFilterSet *BlockFilter = nullptr);
BranchProbability BranchProbability
collectViableSuccessors(MachineBasicBlock *BB, BlockChain &Chain, collectViableSuccessors(MachineBasicBlock *BB, BlockChain &Chain,
@ -315,12 +317,8 @@ class MachineBlockPlacement : public MachineFunctionPass {
/// is provided, no filtering occurs. /// is provided, no filtering occurs.
void fillWorkLists(MachineBasicBlock *MBB, void fillWorkLists(MachineBasicBlock *MBB,
SmallPtrSetImpl<BlockChain *> &UpdatedPreds, SmallPtrSetImpl<BlockChain *> &UpdatedPreds,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter); const BlockFilterSet *BlockFilter);
void buildChain(MachineBasicBlock *BB, BlockChain &Chain, void buildChain(MachineBasicBlock *BB, BlockChain &Chain,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter = nullptr); const BlockFilterSet *BlockFilter = nullptr);
MachineBasicBlock *findBestLoopTop(MachineLoop &L, MachineBasicBlock *findBestLoopTop(MachineLoop &L,
const BlockFilterSet &LoopBlockSet); const BlockFilterSet &LoopBlockSet);
@ -389,8 +387,6 @@ static std::string getBlockName(MachineBasicBlock *BB) {
/// chain which reach the zero-predecessor state to the worklist passed in. /// chain which reach the zero-predecessor state to the worklist passed in.
void MachineBlockPlacement::markChainSuccessors( void MachineBlockPlacement::markChainSuccessors(
BlockChain &Chain, MachineBasicBlock *LoopHeaderBB, BlockChain &Chain, MachineBasicBlock *LoopHeaderBB,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter) { const BlockFilterSet *BlockFilter) {
// Walk all the blocks in this chain, marking their successors as having // Walk all the blocks in this chain, marking their successors as having
// a predecessor placed. // a predecessor placed.
@ -812,8 +808,6 @@ MachineBasicBlock *MachineBlockPlacement::getFirstUnplacedBlock(
void MachineBlockPlacement::fillWorkLists( void MachineBlockPlacement::fillWorkLists(
MachineBasicBlock *MBB, MachineBasicBlock *MBB,
SmallPtrSetImpl<BlockChain *> &UpdatedPreds, SmallPtrSetImpl<BlockChain *> &UpdatedPreds,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter = nullptr) { const BlockFilterSet *BlockFilter = nullptr) {
BlockChain &Chain = *BlockToChain[MBB]; BlockChain &Chain = *BlockToChain[MBB];
if (!UpdatedPreds.insert(&Chain).second) if (!UpdatedPreds.insert(&Chain).second)
@ -843,16 +837,13 @@ void MachineBlockPlacement::fillWorkLists(
void MachineBlockPlacement::buildChain( void MachineBlockPlacement::buildChain(
MachineBasicBlock *BB, BlockChain &Chain, MachineBasicBlock *BB, BlockChain &Chain,
SmallVectorImpl<MachineBasicBlock *> &BlockWorkList,
SmallVectorImpl<MachineBasicBlock *> &EHPadWorkList,
const BlockFilterSet *BlockFilter) { const BlockFilterSet *BlockFilter) {
assert(BB && "BB must not be null.\n"); assert(BB && "BB must not be null.\n");
assert(BlockToChain[BB] == &Chain && "BlockToChainMap mis-match.\n"); assert(BlockToChain[BB] == &Chain && "BlockToChainMap mis-match.\n");
MachineFunction::iterator PrevUnplacedBlockIt = F->begin(); MachineFunction::iterator PrevUnplacedBlockIt = F->begin();
MachineBasicBlock *LoopHeaderBB = BB; MachineBasicBlock *LoopHeaderBB = BB;
markChainSuccessors(Chain, LoopHeaderBB, BlockWorkList, EHPadWorkList, markChainSuccessors(Chain, LoopHeaderBB, BlockFilter);
BlockFilter);
BB = *std::prev(Chain.end()); BB = *std::prev(Chain.end());
for (;;) { for (;;) {
assert(BB && "null block found at end of chain in loop."); assert(BB && "null block found at end of chain in loop.");
@ -888,8 +879,7 @@ void MachineBlockPlacement::buildChain(
SuccChain.UnscheduledPredecessors = 0; SuccChain.UnscheduledPredecessors = 0;
DEBUG(dbgs() << "Merging from " << getBlockName(BB) << " to " DEBUG(dbgs() << "Merging from " << getBlockName(BB) << " to "
<< getBlockName(BestSucc) << "\n"); << getBlockName(BestSucc) << "\n");
markChainSuccessors(SuccChain, LoopHeaderBB, BlockWorkList, EHPadWorkList, markChainSuccessors(SuccChain, LoopHeaderBB, BlockFilter);
BlockFilter);
Chain.merge(BestSucc, &SuccChain); Chain.merge(BestSucc, &SuccChain);
BB = *std::prev(Chain.end()); BB = *std::prev(Chain.end());
} }
@ -1307,8 +1297,8 @@ void MachineBlockPlacement::buildLoopChains(MachineLoop &L) {
for (MachineLoop *InnerLoop : L) for (MachineLoop *InnerLoop : L)
buildLoopChains(*InnerLoop); buildLoopChains(*InnerLoop);
SmallVector<MachineBasicBlock *, 16> BlockWorkList; assert(BlockWorkList.empty());
SmallVector<MachineBasicBlock *, 16> EHPadWorkList; assert(EHPadWorkList.empty());
BlockFilterSet LoopBlockSet = collectLoopBlockSet(L); BlockFilterSet LoopBlockSet = collectLoopBlockSet(L);
// Check if we have profile data for this function. If yes, we will rotate // Check if we have profile data for this function. If yes, we will rotate
@ -1343,10 +1333,9 @@ void MachineBlockPlacement::buildLoopChains(MachineLoop &L) {
UpdatedPreds.insert(&LoopChain); UpdatedPreds.insert(&LoopChain);
for (MachineBasicBlock *LoopBB : LoopBlockSet) for (MachineBasicBlock *LoopBB : LoopBlockSet)
fillWorkLists(LoopBB, UpdatedPreds, BlockWorkList, EHPadWorkList, fillWorkLists(LoopBB, UpdatedPreds, &LoopBlockSet);
&LoopBlockSet);
buildChain(LoopTop, LoopChain, BlockWorkList, EHPadWorkList, &LoopBlockSet); buildChain(LoopTop, LoopChain, &LoopBlockSet);
if (RotateLoopWithProfile) if (RotateLoopWithProfile)
rotateLoopWithProfile(LoopChain, L, LoopBlockSet); rotateLoopWithProfile(LoopChain, L, LoopBlockSet);
@ -1385,6 +1374,9 @@ void MachineBlockPlacement::buildLoopChains(MachineLoop &L) {
} }
assert(!BadLoop && "Detected problems with the placement of this loop."); assert(!BadLoop && "Detected problems with the placement of this loop.");
}); });
BlockWorkList.clear();
EHPadWorkList.clear();
} }
/// When OutlineOpitonalBranches is on, this method colects BBs that /// When OutlineOpitonalBranches is on, this method colects BBs that
@ -1450,15 +1442,15 @@ void MachineBlockPlacement::buildCFGChains() {
for (MachineLoop *L : *MLI) for (MachineLoop *L : *MLI)
buildLoopChains(*L); buildLoopChains(*L);
SmallVector<MachineBasicBlock *, 16> BlockWorkList; assert(BlockWorkList.empty());
SmallVector<MachineBasicBlock *, 16> EHPadWorkList; assert(EHPadWorkList.empty());
SmallPtrSet<BlockChain *, 4> UpdatedPreds; SmallPtrSet<BlockChain *, 4> UpdatedPreds;
for (MachineBasicBlock &MBB : *F) for (MachineBasicBlock &MBB : *F)
fillWorkLists(&MBB, UpdatedPreds, BlockWorkList, EHPadWorkList); fillWorkLists(&MBB, UpdatedPreds);
BlockChain &FunctionChain = *BlockToChain[&F->front()]; BlockChain &FunctionChain = *BlockToChain[&F->front()];
buildChain(&F->front(), FunctionChain, BlockWorkList, EHPadWorkList); buildChain(&F->front(), FunctionChain);
#ifndef NDEBUG #ifndef NDEBUG
typedef SmallPtrSet<MachineBasicBlock *, 16> FunctionBlockSetType; typedef SmallPtrSet<MachineBasicBlock *, 16> FunctionBlockSetType;
@ -1539,6 +1531,9 @@ void MachineBlockPlacement::buildCFGChains() {
MachineBasicBlock *TBB = nullptr, *FBB = nullptr; // For AnalyzeBranch. MachineBasicBlock *TBB = nullptr, *FBB = nullptr; // For AnalyzeBranch.
if (!TII->AnalyzeBranch(F->back(), TBB, FBB, Cond)) if (!TII->AnalyzeBranch(F->back(), TBB, FBB, Cond))
F->back().updateTerminator(); F->back().updateTerminator();
BlockWorkList.clear();
EHPadWorkList.clear();
} }
void MachineBlockPlacement::optimizeBranches() { void MachineBlockPlacement::optimizeBranches() {