commit 65b07b8e1b73816dc7f339e2c461f1bc72443319
author Kevin Qin <Kevin.Qin@arm.com> Mon Mar 09 07:26:37 2015 +0000
committer Kevin Qin <Kevin.Qin@arm.com> Mon Mar 09 07:26:37 2015 +0000
tree 52516b5c4d3034b36921e6d7d2e47e1b6aea36d5
parent f8f259df48d3af96b06b50b14cc08e7e72b028ce

Revert r231630 - Run LICM pass after loop unrolling pass.

As it broke llvm bootstrap.

llvm-svn: 231635

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

diff --git a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
index 7ff55a7..21fa34d 100644
--- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
+++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -364,14 +364,8 @@
   MPM.add(createCFGSimplificationPass());
   MPM.add(createInstructionCombiningPass());
 
-  if (!DisableUnrollLoops) {
+  if (!DisableUnrollLoops)
     MPM.add(createLoopUnrollPass());    // Unroll small loops
-    // Runtime unrollng will introduce runtime check in loop prologue. If the
-    // unrolled loop is a inner loop, then the prologue will be inside the
-    // outer loop. LICM pass can help to promote the runtime check out if the
-    // checked value is loop invariant.
-    MPM.add(createLICMPass());
-  }
 
   // After vectorization and unrolling, assume intrinsics may tell us more
   // about pointer alignments.

llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp

diff --git a/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp b/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp
index 9e2d8c9..91b688c 100644
--- a/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp
+++ b/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp
@@ -142,7 +142,7 @@
                             BasicBlock *InsertTop, BasicBlock *InsertBot,
                             std::vector<BasicBlock *> &NewBlocks,
                             LoopBlocksDFS &LoopBlocks, ValueToValueMapTy &VMap,
-                            LoopInfo *LI, LPPassManager *LPM) {
+                            LoopInfo *LI) {
   BasicBlock *Preheader = L->getLoopPreheader();
   BasicBlock *Header = L->getHeader();
   BasicBlock *Latch = L->getLoopLatch();
@@ -153,7 +153,10 @@
   Loop *ParentLoop = L->getParentLoop();
   if (!UnrollProlog) {
     NewLoop = new Loop();
-    LPM->insertLoop(NewLoop, ParentLoop);
+    if (ParentLoop)
+      ParentLoop->addChildLoop(NewLoop);
+    else
+      LI->addTopLevelLoop(NewLoop);
   }
 
   // For each block in the original loop, create a new copy,
@@ -387,7 +390,7 @@
   // the loop, otherwise we create a cloned loop to execute the extra
   // iterations. This function adds the appropriate CFG connections.
   CloneLoopBlocks(L, ModVal, UnrollPrologue, PH, PEnd, NewBlocks, LoopBlocks,
-                  VMap, LI, LPM);
+                  VMap, LI);
 
   // Insert the cloned blocks into function just before the original loop
   F->getBasicBlockList().splice(PEnd, F->getBasicBlockList(), NewBlocks[0],