Refactor debug statement and remove dead argument. NFC.

llvm-svn: 219626
This commit is contained in:
Chad Rosier 2014-10-13 19:46:39 +00:00
parent 679659f58c
commit df82a33d42
2 changed files with 13 additions and 18 deletions

View File

@ -2353,7 +2353,6 @@ bool SelectionDAGBuilder::handleJTSwitchCase(CaseRec &CR,
bool SelectionDAGBuilder::handleBTSplitSwitchCase(CaseRec& CR, bool SelectionDAGBuilder::handleBTSplitSwitchCase(CaseRec& CR,
CaseRecVector& WorkList, CaseRecVector& WorkList,
const Value* SV, const Value* SV,
MachineBasicBlock* Default,
MachineBasicBlock* SwitchBB) { MachineBasicBlock* SwitchBB) {
// Get the MachineFunction which holds the current MBB. This is used when // Get the MachineFunction which holds the current MBB. This is used when
// inserting any additional MBBs necessary to represent the switch. // inserting any additional MBBs necessary to represent the switch.
@ -2618,10 +2617,8 @@ bool SelectionDAGBuilder::handleBitTestsSwitchCase(CaseRec& CR,
} }
/// Clusterify - Transform simple list of Cases into list of CaseRange's /// Clusterify - Transform simple list of Cases into list of CaseRange's
size_t SelectionDAGBuilder::Clusterify(CaseVector& Cases, void SelectionDAGBuilder::Clusterify(CaseVector& Cases,
const SwitchInst& SI) { const SwitchInst& SI) {
size_t numCmps = 0;
BranchProbabilityInfo *BPI = FuncInfo.BPI; BranchProbabilityInfo *BPI = FuncInfo.BPI;
// Start with "simple" cases // Start with "simple" cases
for (SwitchInst::ConstCaseIt i = SI.case_begin(), e = SI.case_end(); for (SwitchInst::ConstCaseIt i = SI.case_begin(), e = SI.case_end();
@ -2659,13 +2656,15 @@ size_t SelectionDAGBuilder::Clusterify(CaseVector& Cases,
} }
} }
for (CaseItr I=Cases.begin(), E=Cases.end(); I!=E; ++I, ++numCmps) { DEBUG({
if (I->Low != I->High) size_t numCmps = 0;
for (auto &I : Cases)
// A range counts double, since it requires two compares. // A range counts double, since it requires two compares.
++numCmps; numCmps += I.Low != I.High ? 2 : 1;
}
return numCmps; dbgs() << "Clusterify finished. Total clusters: " << Cases.size()
<< ". Total compares: " << numCmps << '\n';
});
} }
void SelectionDAGBuilder::UpdateSplitBlock(MachineBasicBlock *First, void SelectionDAGBuilder::UpdateSplitBlock(MachineBasicBlock *First,
@ -2707,10 +2706,7 @@ void SelectionDAGBuilder::visitSwitch(const SwitchInst &SI) {
// representing each one, and sort the vector so that we can efficiently // representing each one, and sort the vector so that we can efficiently
// create a binary search tree from them. // create a binary search tree from them.
CaseVector Cases; CaseVector Cases;
size_t numCmps = Clusterify(Cases, SI); Clusterify(Cases, SI);
DEBUG(dbgs() << "Clusterify finished. Total clusters: " << Cases.size()
<< ". Total compares: " << numCmps << '\n');
(void)numCmps;
// Get the Value to be switched on and default basic blocks, which will be // Get the Value to be switched on and default basic blocks, which will be
// inserted into CaseBlock records, representing basic blocks in the binary // inserted into CaseBlock records, representing basic blocks in the binary
@ -2744,7 +2740,7 @@ void SelectionDAGBuilder::visitSwitch(const SwitchInst &SI) {
// Emit binary tree. We need to pick a pivot, and push left and right ranges // Emit binary tree. We need to pick a pivot, and push left and right ranges
// onto the worklist. Leafs are handled via handleSmallSwitchRange() call. // onto the worklist. Leafs are handled via handleSmallSwitchRange() call.
handleBTSplitSwitchCase(CR, WorkList, SV, Default, SwitchMBB); handleBTSplitSwitchCase(CR, WorkList, SV, SwitchMBB);
} }
} }

View File

@ -200,7 +200,7 @@ private:
} }
}; };
size_t Clusterify(CaseVector &Cases, const SwitchInst &SI); void Clusterify(CaseVector &Cases, const SwitchInst &SI);
/// CaseBlock - This structure is used to communicate between /// CaseBlock - This structure is used to communicate between
/// SelectionDAGBuilder and SDISel for the code generation of additional basic /// SelectionDAGBuilder and SDISel for the code generation of additional basic
@ -665,7 +665,6 @@ private:
bool handleBTSplitSwitchCase(CaseRec& CR, bool handleBTSplitSwitchCase(CaseRec& CR,
CaseRecVector& WorkList, CaseRecVector& WorkList,
const Value* SV, const Value* SV,
MachineBasicBlock* Default,
MachineBasicBlock *SwitchBB); MachineBasicBlock *SwitchBB);
bool handleBitTestsSwitchCase(CaseRec& CR, bool handleBitTestsSwitchCase(CaseRec& CR,
CaseRecVector& WorkList, CaseRecVector& WorkList,