[llvm-branch-commits] [llvm-branch] r121527 - /llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:31:45 2010
New Revision: 121527

URL: http://llvm.org/viewvc/llvm-project?rev=121527&view=rev
Log:
Merge r120440:
--
Author: Cameron Zwarich <zwarich at apple.com>
Date:   Tue Nov 30 18:51:19 2010 +0000

    Change the basic block map in LoopInfo from a std::map to a DenseMap. This is a 16% speedup running loops on test-suite + SPEC2000.

    Reviewed by Eric Christopher.

Modified:
    llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h

Modified: llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h?rev=121527&r1=121526&r2=121527&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h (original)
+++ llvm/branches/Apple/whitney/include/llvm/Analysis/LoopInfo.h Fri Dec 10 15:31:45 2010
@@ -32,6 +32,7 @@
 #define LLVM_ANALYSIS_LOOP_INFO_H
 
 #include "llvm/Pass.h"
+#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/SmallVector.h"
@@ -629,7 +630,7 @@
 template<class BlockT, class LoopT>
 class LoopInfoBase {
   // BBMap - Mapping of basic blocks to the inner most loop they occur in
-  std::map<BlockT *, LoopT *> BBMap;
+  DenseMap<BlockT *, LoopT *> BBMap;
   std::vector<LoopT *> TopLevelLoops;
   friend class LoopBase<BlockT, LoopT>;
 
@@ -660,7 +661,7 @@
   /// block is in no loop (for example the entry node), null is returned.
   ///
   LoopT *getLoopFor(const BlockT *BB) const {
-    typename std::map<BlockT *, LoopT *>::const_iterator I=
+    typename DenseMap<BlockT *, LoopT *>::const_iterator I=
       BBMap.find(const_cast<BlockT*>(BB));
     return I != BBMap.end() ? I->second : 0;
   }
@@ -728,7 +729,7 @@
   /// including all of the Loop objects it is nested in and our mapping from
   /// BasicBlocks to loops.
   void removeBlock(BlockT *BB) {
-    typename std::map<BlockT *, LoopT *>::iterator I = BBMap.find(BB);
+    typename DenseMap<BlockT *, LoopT *>::iterator I = BBMap.find(BB);
     if (I != BBMap.end()) {
       for (LoopT *L = I->second; L; L = L->getParentLoop())
         L->removeBlockFromLoop(BB);
@@ -922,7 +923,7 @@
     for (unsigned i = 0; i < TopLevelLoops.size(); ++i)
       TopLevelLoops[i]->print(OS);
   #if 0
-    for (std::map<BasicBlock*, LoopT*>::const_iterator I = BBMap.begin(),
+    for (DenseMap<BasicBlock*, LoopT*>::const_iterator I = BBMap.begin(),
            E = BBMap.end(); I != E; ++I)
       OS << "BB '" << I->first->getName() << "' level = "
          << I->second->getLoopDepth() << "\n";