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

In mem2reg, when handling the single-store case, make sure to remove 

a using block from the list if we handle it.  Not doing this caused us
to not be able to promote (with the fast path) allocas which have uses (whoops).

This increases the # allocas hitting this fastpath from 4042 to 8935 on the
testcase in PR1432, speeding up mem2reg by 2.6x

llvm-svn: 40809
This commit is contained in:
Chris Lattner 2007-08-04 02:15:24 +00:00
parent 450f95c857
commit 9181801bb7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
View File

@ -531,28 +531,29 @@ void PromoteMem2Reg::run() {
/// the value stored. /// the value stored.
void PromoteMem2Reg::RewriteSingleStoreAlloca(AllocaInst *AI, void PromoteMem2Reg::RewriteSingleStoreAlloca(AllocaInst *AI,
AllocaInfo &Info) { AllocaInfo &Info) {
StoreInst *OnlyStore = Info.OnlyStore;
// Be aware of loads before the store. // Be aware of loads before the store.
std::set<BasicBlock*> ProcessedBlocks; std::set<BasicBlock*> ProcessedBlocks;
for (unsigned i = 0, e = Info.UsingBlocks.size(); i != e; ++i) { for (unsigned i = 0, e = Info.UsingBlocks.size(); i != e; ++i) {
// If the store dominates the block and if we haven't processed it yet, // If the store dominates the block and if we haven't processed it yet,
// do so now. // do so now.
if (!dominates(Info.OnlyStore->getParent(), Info.UsingBlocks[i])) if (!dominates(OnlyStore->getParent(), Info.UsingBlocks[i]))
continue;
if (!ProcessedBlocks.insert(Info.UsingBlocks[i]).second)
continue; continue;
BasicBlock *UseBlock = Info.UsingBlocks[i]; BasicBlock *UseBlock = Info.UsingBlocks[i];
if (!ProcessedBlocks.insert(UseBlock).second)
continue;
// If the use and store are in the same block, do a quick scan to // If the use and store are in the same block, do a quick scan to
// verify that there are no uses before the store. // verify that there are no uses before the store.
if (UseBlock == Info.OnlyStore->getParent()) { if (UseBlock == OnlyStore->getParent()) {
BasicBlock::iterator I = UseBlock->begin(); BasicBlock::iterator I = UseBlock->begin();
for (; &*I != Info.OnlyStore; ++I) { // scan block for store. for (; &*I != OnlyStore; ++I) { // scan block for store.
if (isa<LoadInst>(I) && I->getOperand(0) == AI) if (isa<LoadInst>(I) && I->getOperand(0) == AI)
break; break;
} }
if (&*I != Info.OnlyStore) break; // Do not handle this case. if (&*I != OnlyStore) break; // Do not handle this case.
} }
// Otherwise, if this is a different block or if all uses happen // Otherwise, if this is a different block or if all uses happen
@ -562,7 +563,7 @@ void PromoteMem2Reg::RewriteSingleStoreAlloca(AllocaInst *AI,
I != E; ) { I != E; ) {
if (LoadInst *LI = dyn_cast<LoadInst>(I++)) { if (LoadInst *LI = dyn_cast<LoadInst>(I++)) {
if (LI->getOperand(0) == AI) { if (LI->getOperand(0) == AI) {
LI->replaceAllUsesWith(Info.OnlyStore->getOperand(0)); LI->replaceAllUsesWith(OnlyStore->getOperand(0));
if (AST && isa<PointerType>(LI->getType())) if (AST && isa<PointerType>(LI->getType()))
AST->deleteValue(LI); AST->deleteValue(LI);
LI->eraseFromParent(); LI->eraseFromParent();
@ -572,6 +573,7 @@ void PromoteMem2Reg::RewriteSingleStoreAlloca(AllocaInst *AI,
// Finally, remove this block from the UsingBlock set. // Finally, remove this block from the UsingBlock set.
Info.UsingBlocks[i] = Info.UsingBlocks.back(); Info.UsingBlocks[i] = Info.UsingBlocks.back();
Info.UsingBlocks.pop_back();
--i; --e; --i; --e;
} }
} }