Author: dpatel Date: Mon Aug 20 19:31:24 2007 New Revision: 41207 URL: http://llvm.org/viewvc/llvm-project?rev=41207&view=rev Log: Use SmallVector instead of std::vector.
Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h llvm/trunk/lib/Analysis/LoopInfo.cpp llvm/trunk/lib/Analysis/ScalarEvolution.cpp llvm/trunk/lib/Transforms/IPO/LoopExtractor.cpp llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp llvm/trunk/lib/Transforms/Scalar/LICM.cpp llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp llvm/trunk/lib/Transforms/Utils/LCSSA.cpp llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp Modified: llvm/trunk/include/llvm/Analysis/LoopInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/LoopInfo.h?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/LoopInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/LoopInfo.h Mon Aug 20 19:31:24 2007 @@ -32,6 +32,7 @@ #include "llvm/Pass.h" #include "llvm/ADT/GraphTraits.h" +#include "llvm/ADT/SmallVector.h" namespace llvm { @@ -111,18 +112,18 @@ /// outside of the loop. These are the blocks _inside of the current loop_ /// which branch out. The returned list is always unique. /// - void getExitingBlocks(std::vector<BasicBlock*> &Blocks) const; + void getExitingBlocks(SmallVector<BasicBlock *, 8> &Blocks) const; /// getExitBlocks - Return all of the successor blocks of this loop. These /// are the blocks _outside of the current loop_ which are branched to. /// - void getExitBlocks(std::vector<BasicBlock*> &Blocks) const; + void getExitBlocks(SmallVector<BasicBlock*, 8> &Blocks) const; /// getUniqueExitBlocks - Return all unique successor blocks of this loop. /// These are the blocks _outside of the current loop_ which are branched to. /// This assumes that loop is in canonical form. /// - void getUniqueExitBlocks(std::vector<BasicBlock*> &ExitBlocks) const; + void getUniqueExitBlocks(SmallVector<BasicBlock*, 8> &ExitBlocks) const; /// getLoopPreheader - If there is a preheader for this loop, return it. A /// loop has a preheader if there is only one edge to the header of the loop Modified: llvm/trunk/lib/Analysis/LoopInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopInfo.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/LoopInfo.cpp (original) +++ llvm/trunk/lib/Analysis/LoopInfo.cpp Mon Aug 20 19:31:24 2007 @@ -350,7 +350,7 @@ /// outside of the loop. These are the blocks _inside of the current loop_ /// which branch out. The returned list is always unique. /// -void Loop::getExitingBlocks(std::vector<BasicBlock*> &ExitingBlocks) const { +void Loop::getExitingBlocks(SmallVector<BasicBlock*, 8> &ExitingBlocks) const { // Sort the blocks vector so that we can use binary search to do quick // lookups. std::vector<BasicBlock*> LoopBBs(block_begin(), block_end()); @@ -369,7 +369,7 @@ /// getExitBlocks - Return all of the successor blocks of this loop. These /// are the blocks _outside of the current loop_ which are branched to. /// -void Loop::getExitBlocks(std::vector<BasicBlock*> &ExitBlocks) const { +void Loop::getExitBlocks(SmallVector<BasicBlock*, 8> &ExitBlocks) const { // Sort the blocks vector so that we can use binary search to do quick // lookups. std::vector<BasicBlock*> LoopBBs(block_begin(), block_end()); @@ -387,7 +387,7 @@ /// are the blocks _outside of the current loop_ which are branched to. This /// assumes that loop is in canonical form. // -void Loop::getUniqueExitBlocks(std::vector<BasicBlock*> &ExitBlocks) const { +void Loop::getUniqueExitBlocks(SmallVector<BasicBlock*, 8> &ExitBlocks) const { // Sort the blocks vector so that we can use binary search to do quick // lookups. std::vector<BasicBlock*> LoopBBs(block_begin(), block_end()); Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original) +++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Mon Aug 20 19:31:24 2007 @@ -1569,7 +1569,7 @@ /// will iterate. SCEVHandle ScalarEvolutionsImpl::ComputeIterationCount(const Loop *L) { // If the loop has a non-one exit block count, we can't analyze it. - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getExitBlocks(ExitBlocks); if (ExitBlocks.size() != 1) return UnknownValue; @@ -2620,7 +2620,7 @@ cerr << "Loop " << L->getHeader()->getName() << ": "; - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getExitBlocks(ExitBlocks); if (ExitBlocks.size() != 1) cerr << "<multiple exits> "; Modified: llvm/trunk/lib/Transforms/IPO/LoopExtractor.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/LoopExtractor.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/LoopExtractor.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/LoopExtractor.cpp Mon Aug 20 19:31:24 2007 @@ -104,7 +104,7 @@ else { // Check to see if any exits from the loop are more than just return // blocks. - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; TLL->getExitBlocks(ExitBlocks); for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i) if (!isa<ReturnInst>(ExitBlocks[i]->getTerminator())) { Modified: llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Mon Aug 20 19:31:24 2007 @@ -224,7 +224,7 @@ SCEVExpander &RW) { // Find the exit block for the loop. We can currently only handle loops with // a single exit. - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getExitBlocks(ExitBlocks); if (ExitBlocks.size() != 1) return 0; BasicBlock *ExitBlock = ExitBlocks[0]; @@ -309,7 +309,7 @@ // We insert the code into the preheader of the loop if the loop contains // multiple exit blocks, or in the exit block if there is exactly one. BasicBlock *BlockToInsertInto; - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getUniqueExitBlocks(ExitBlocks); if (ExitBlocks.size() == 1) BlockToInsertInto = ExitBlocks[0]; Modified: llvm/trunk/lib/Transforms/Scalar/LICM.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LICM.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LICM.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LICM.cpp Mon Aug 20 19:31:24 2007 @@ -446,7 +446,7 @@ void LICM::sink(Instruction &I) { DOUT << "LICM sinking instruction: " << I; - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; CurLoop->getExitBlocks(ExitBlocks); if (isa<LoadInst>(I)) ++NumMovedLoads; @@ -623,7 +623,7 @@ return true; // Get the exit blocks for the current loop. - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; CurLoop->getExitBlocks(ExitBlocks); // For each exit block, get the DT node and walk up the DT until the @@ -725,7 +725,7 @@ // std::set<BasicBlock*> ProcessedBlocks; - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; CurLoop->getExitBlocks(ExitBlocks); for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i) if (ProcessedBlocks.insert(ExitBlocks[i]).second) { Modified: llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp Mon Aug 20 19:31:24 2007 @@ -157,7 +157,7 @@ // Keep it simple, and restrict loop rotation to loops with one exit only. // In future, lift this restriction and support for multiple exits if // required. - std::vector<BasicBlock *> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getExitBlocks(ExitBlocks); if (ExitBlocks.size() > 1) return false; Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Mon Aug 20 19:31:24 2007 @@ -622,7 +622,7 @@ // We want the loop to come after the preheader, but before the exit blocks. LoopBlocks.insert(LoopBlocks.end(), L->block_begin(), L->block_end()); - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getUniqueExitBlocks(ExitBlocks); // Split all of the edges from inside the loop to their exit blocks. Update Modified: llvm/trunk/lib/Transforms/Utils/LCSSA.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LCSSA.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LCSSA.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LCSSA.cpp Mon Aug 20 19:31:24 2007 @@ -59,7 +59,7 @@ virtual bool runOnLoop(Loop *L, LPPassManager &LPM); void ProcessInstruction(Instruction* Instr, - const std::vector<BasicBlock*>& exitBlocks); + const SmallVector<BasicBlock*, 8>& exitBlocks); /// This transformation requires natural loop information & requires that /// loop preheaders be inserted into the CFG. It maintains both of these, @@ -107,7 +107,6 @@ LI = &LPM.getAnalysis<LoopInfo>(); DT = &getAnalysis<DominatorTree>(); - DominanceFrontier *DF = getAnalysisToUpdate<DominanceFrontier>(); // Speed up queries by creating a sorted list of blocks LoopBlocks.clear(); @@ -122,9 +121,8 @@ if (AffectedValues.empty()) return false; - std::vector<BasicBlock*> exitBlocks; - L->getExitBlocks(exitBlocks); - + SmallVector<BasicBlock*, 8> exitBlocks; + L->getExitBlocks(exitBlocks); // Iterate over all affected values for this loop and insert Phi nodes // for them in the appropriate exit blocks @@ -141,7 +139,7 @@ /// processInstruction - Given a live-out instruction, insert LCSSA Phi nodes, /// eliminate all out-of-loop uses. void LCSSA::ProcessInstruction(Instruction *Instr, - const std::vector<BasicBlock*>& exitBlocks) { + const SmallVector<BasicBlock*, 8>& exitBlocks) { ++NumLCSSA; // We are applying the transformation // Keep track of the blocks that have the value available already. @@ -151,7 +149,7 @@ // Insert the LCSSA phi's into the exit blocks (dominated by the value), and // add them to the Phi's map. - for (std::vector<BasicBlock*>::const_iterator BBI = exitBlocks.begin(), + for (SmallVector<BasicBlock*, 8>::const_iterator BBI = exitBlocks.begin(), BBE = exitBlocks.end(); BBI != BBE; ++BBI) { BasicBlock *BB = *BBI; DomTreeNode *ExitBBNode = DT->getNode(BB); Modified: llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp?rev=41207&r1=41206&r2=41207&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LoopSimplify.cpp Mon Aug 20 19:31:24 2007 @@ -199,7 +199,7 @@ // predecessors that are inside of the loop. This check guarantees that the // loop preheader/header will dominate the exit blocks. If the exit block has // predecessors from outside of the loop, split the edge now. - std::vector<BasicBlock*> ExitBlocks; + SmallVector<BasicBlock*, 8> ExitBlocks; L->getExitBlocks(ExitBlocks); SetVector<BasicBlock*> ExitBlockSet(ExitBlocks.begin(), ExitBlocks.end()); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits