Remove more malloc thrashing, this speeds up IPSCCP on kimwitu another 6.7%.

llvm-svn: 33796
This commit is contained in:
Chris Lattner 2007-02-02 21:15:06 +00:00
parent f089c99f1d
commit 37d400a83d
1 changed files with 10 additions and 10 deletions

View File

@ -344,7 +344,7 @@ private:
// getFeasibleSuccessors - Return a vector of booleans to indicate which // getFeasibleSuccessors - Return a vector of booleans to indicate which
// successors are reachable from a given terminator instruction. // successors are reachable from a given terminator instruction.
// //
void getFeasibleSuccessors(TerminatorInst &TI, std::vector<bool> &Succs); void getFeasibleSuccessors(TerminatorInst &TI, SmallVector<bool, 16> &Succs);
// isEdgeFeasible - Return true if the control flow edge from the 'From' basic // isEdgeFeasible - Return true if the control flow edge from the 'From' basic
// block to the 'To' basic block is currently feasible... // block to the 'To' basic block is currently feasible...
@ -411,7 +411,7 @@ private:
// successors are reachable from a given terminator instruction. // successors are reachable from a given terminator instruction.
// //
void SCCPSolver::getFeasibleSuccessors(TerminatorInst &TI, void SCCPSolver::getFeasibleSuccessors(TerminatorInst &TI,
std::vector<bool> &Succs) { SmallVector<bool, 16> &Succs) {
Succs.resize(TI.getNumSuccessors()); Succs.resize(TI.getNumSuccessors());
if (BranchInst *BI = dyn_cast<BranchInst>(&TI)) { if (BranchInst *BI = dyn_cast<BranchInst>(&TI)) {
if (BI->isUnconditional()) { if (BI->isUnconditional()) {
@ -452,8 +452,7 @@ void SCCPSolver::getFeasibleSuccessors(TerminatorInst &TI,
Succs[0] = true; Succs[0] = true;
} }
} else { } else {
cerr << "SCCP: Don't know how to handle: " << TI; assert(0 && "SCCP: Don't know how to handle this terminator!");
Succs.assign(TI.getNumSuccessors(), true);
} }
} }
@ -543,8 +542,7 @@ void SCCPSolver::visitPHINode(PHINode &PN) {
std::multimap<PHINode*, Instruction*>::iterator I, E; std::multimap<PHINode*, Instruction*>::iterator I, E;
tie(I, E) = UsersOfOverdefinedPHIs.equal_range(&PN); tie(I, E) = UsersOfOverdefinedPHIs.equal_range(&PN);
if (I != E) { if (I != E) {
std::vector<Instruction*> Users; SmallVector<Instruction*, 16> Users;
Users.reserve(std::distance(I, E));
for (; I != E; ++I) Users.push_back(I->second); for (; I != E; ++I) Users.push_back(I->second);
while (!Users.empty()) { while (!Users.empty()) {
visit(Users.back()); visit(Users.back());
@ -624,7 +622,7 @@ void SCCPSolver::visitReturnInst(ReturnInst &I) {
void SCCPSolver::visitTerminatorInst(TerminatorInst &TI) { void SCCPSolver::visitTerminatorInst(TerminatorInst &TI) {
std::vector<bool> SuccFeasible; SmallVector<bool, 16> SuccFeasible;
getFeasibleSuccessors(TI, SuccFeasible); getFeasibleSuccessors(TI, SuccFeasible);
BasicBlock *BB = TI.getParent(); BasicBlock *BB = TI.getParent();
@ -1385,6 +1383,7 @@ bool SCCP::runOnFunction(Function &F) {
// as we cannot modify the CFG of the function. // as we cannot modify the CFG of the function.
// //
SmallSet<BasicBlock*, 16> &ExecutableBBs = Solver.getExecutableBlocks(); SmallSet<BasicBlock*, 16> &ExecutableBBs = Solver.getExecutableBlocks();
SmallVector<Instruction*, 32> Insts;
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
if (!ExecutableBBs.count(BB)) { if (!ExecutableBBs.count(BB)) {
DOUT << " BasicBlock Dead:" << *BB; DOUT << " BasicBlock Dead:" << *BB;
@ -1392,7 +1391,6 @@ bool SCCP::runOnFunction(Function &F) {
// Delete the instructions backwards, as it has a reduced likelihood of // Delete the instructions backwards, as it has a reduced likelihood of
// having to update as many def-use and use-def chains. // having to update as many def-use and use-def chains.
std::vector<Instruction*> Insts;
for (BasicBlock::iterator I = BB->begin(), E = BB->getTerminator(); for (BasicBlock::iterator I = BB->begin(), E = BB->getTerminator();
I != E; ++I) I != E; ++I)
Insts.push_back(I); Insts.push_back(I);
@ -1524,6 +1522,9 @@ bool IPSCCP::runOnModule(Module &M) {
// constants if we have found them to be of constant values. // constants if we have found them to be of constant values.
// //
SmallSet<BasicBlock*, 16> &ExecutableBBs = Solver.getExecutableBlocks(); SmallSet<BasicBlock*, 16> &ExecutableBBs = Solver.getExecutableBlocks();
SmallVector<Instruction*, 32> Insts;
SmallVector<BasicBlock*, 32> BlocksToErase;
for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) { for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
for (Function::arg_iterator AI = F->arg_begin(), E = F->arg_end(); for (Function::arg_iterator AI = F->arg_begin(), E = F->arg_end();
AI != E; ++AI) AI != E; ++AI)
@ -1541,7 +1542,6 @@ bool IPSCCP::runOnModule(Module &M) {
} }
} }
std::vector<BasicBlock*> BlocksToErase;
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB)
if (!ExecutableBBs.count(BB)) { if (!ExecutableBBs.count(BB)) {
DOUT << " BasicBlock Dead:" << *BB; DOUT << " BasicBlock Dead:" << *BB;
@ -1549,7 +1549,6 @@ bool IPSCCP::runOnModule(Module &M) {
// Delete the instructions backwards, as it has a reduced likelihood of // Delete the instructions backwards, as it has a reduced likelihood of
// having to update as many def-use and use-def chains. // having to update as many def-use and use-def chains.
std::vector<Instruction*> Insts;
TerminatorInst *TI = BB->getTerminator(); TerminatorInst *TI = BB->getTerminator();
for (BasicBlock::iterator I = BB->begin(), E = TI; I != E; ++I) for (BasicBlock::iterator I = BB->begin(), E = TI; I != E; ++I)
Insts.push_back(I); Insts.push_back(I);
@ -1643,6 +1642,7 @@ bool IPSCCP::runOnModule(Module &M) {
// Finally, delete the basic block. // Finally, delete the basic block.
F->getBasicBlockList().erase(DeadBB); F->getBasicBlockList().erase(DeadBB);
} }
BlocksToErase.clear();
} }
// If we inferred constant or undef return values for a function, we replaced // If we inferred constant or undef return values for a function, we replaced