As it broke llvm bootstrap.
llvm-svn: 231635
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.
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();
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,
// 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],
+++ /dev/null
-; RUN: opt < %s -S -O2 -unroll-runtime=true | FileCheck %s
-
-; Check runtime unrolling prologue can be promoted by LICM pass.
-
-; CHECK: entry:
-; CHECK: %xtraiter
-; CHECK: %lcmp.mod
-; CHECK: loop1:
-; CHECK: br i1 %lcmp.mod
-; CHECK: loop2.prol:
-
-define void @unroll(i32 %iter, i32* %addr1, i32* %addr2) nounwind {
-entry:
- br label %loop1
-
-loop1:
- %iv1 = phi i32 [ 0, %entry ], [ %inc1, %loop1.latch ]
- %offset1 = getelementptr i32, i32* %addr1, i32 %iv1
- store i32 %iv1, i32* %offset1, align 4
- br label %loop2.header
-
-loop2.header:
- br label %loop2
-
-loop2:
- %iv2 = phi i32 [ 0, %loop2.header ], [ %inc2, %loop2 ]
- %offset2 = getelementptr i32, i32* %addr2, i32 %iv2
- store i32 %iv2, i32* %offset2, align 4
- %inc2 = add i32 %iv2, 1
- %exitcnd2 = icmp uge i32 %inc2, %iter
- br i1 %exitcnd2, label %exit2, label %loop2
-
-exit2:
- br label %loop1.latch
-
-loop1.latch:
- %inc1 = add i32 %iv1, 1
- %exitcnd1 = icmp uge i32 %inc1, 1024
- br i1 %exitcnd1, label %exit, label %loop1
-
-exit:
- ret void
-}