From: Chris Lattner Date: Wed, 4 Feb 2004 21:33:42 +0000 (+0000) Subject: Two changes: X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1df7e1799a7a97602bdedec818f7ab1dc514b4e;p=oota-llvm.git Two changes: 1. Don't scan to the end of alloca instructions in the caller function to insert inlined allocas, just insert at the top. This saves a lot of time inlining into functions with a lot of allocas. 2. Use splice to move the alloca instructions over, instead of remove/insert. This allows us to transfer a block at a time, and eliminates a bunch of silly symbol table manipulations. This speeds up the inliner on the testcase in PR209 from 1.73s -> 1.04s (67%) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11118 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp index 5c1564b0ed8..8edf9d071b1 100644 --- a/lib/Transforms/Utils/InlineFunction.cpp +++ b/lib/Transforms/Utils/InlineFunction.cpp @@ -73,7 +73,7 @@ bool llvm::InlineFunction(CallSite CS) { // Clone the entire body of the callee into the caller. CloneFunctionInto(Caller, CalledFunc, ValueMap, Returns, ".i"); } - + // Remember the first block that is newly cloned over. Function::iterator FirstNewBlock = LastBlock; ++FirstNewBlock; @@ -84,14 +84,21 @@ bool llvm::InlineFunction(CallSite CS) { // if (isa(FirstNewBlock->begin())) { BasicBlock::iterator InsertPoint = Caller->begin()->begin(); - while (isa(InsertPoint)) ++InsertPoint; - for (BasicBlock::iterator I = FirstNewBlock->begin(), E = FirstNewBlock->end(); I != E; ) if (AllocaInst *AI = dyn_cast(I++)) if (isa(AI->getArraySize())) { - FirstNewBlock->getInstList().remove(AI); - Caller->front().getInstList().insert(InsertPoint, AI); + // Scan for the block of allocas that we can move over. + while (isa(I) && + isa(cast(I)->getArraySize())) + ++I; + + // Transfer all of the allocas over in a block. Using splice means + // that they instructions aren't removed from the symbol table, then + // reinserted. + Caller->front().getInstList().splice(InsertPoint, + FirstNewBlock->getInstList(), + AI, I); } }