[PATCH] D37153: [LoopUnroll] Properly update loop structure in case of successful peeling
Davide Italiano via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 28 13:30:46 PDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL311922: [LoopUnroll] Properly update loop structure in case of successful peeling. (authored by davide).
Changed prior to commit:
https://reviews.llvm.org/D37153?vs=112735&id=112953#toc
Repository:
rL LLVM
https://reviews.llvm.org/D37153
Files:
llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp
llvm/trunk/test/Transforms/LoopUnroll/pr33437.ll
Index: llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp
+++ llvm/trunk/lib/Transforms/Utils/LoopUnroll.cpp
@@ -396,8 +396,19 @@
"Did not expect runtime trip-count unrolling "
"and peeling for the same loop");
- if (PeelCount)
- peelLoop(L, PeelCount, LI, SE, DT, AC, PreserveLCSSA);
+ if (PeelCount) {
+ bool Peeled = peelLoop(L, PeelCount, LI, SE, DT, AC, PreserveLCSSA);
+
+ // Successful peeling may result in a change in the loop preheader/trip
+ // counts. If we later unroll the loop, we want these to be updated.
+ if (Peeled) {
+ BasicBlock *ExitingBlock = L->getExitingBlock();
+ assert(ExitingBlock && "Loop without exiting block?");
+ Preheader = L->getLoopPreheader();
+ TripCount = SE->getSmallConstantTripCount(L, ExitingBlock);
+ TripMultiple = SE->getSmallConstantTripMultiple(L, ExitingBlock);
+ }
+ }
// Loops containing convergent instructions must have a count that divides
// their TripMultiple.
Index: llvm/trunk/test/Transforms/LoopUnroll/pr33437.ll
===================================================================
--- llvm/trunk/test/Transforms/LoopUnroll/pr33437.ll
+++ llvm/trunk/test/Transforms/LoopUnroll/pr33437.ll
@@ -0,0 +1,30 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -loop-unroll %s -S | FileCheck %s
+
+declare zeroext i8 @patatino()
+
+define fastcc void @tinky() {
+; CHECK-LABEL: @tinky(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: br label [[FOR_COND93:%.*]]
+; CHECK: for.cond93:
+; CHECK-NEXT: br label [[FOR_BODY198:%.*]]
+; CHECK: for.body198:
+; CHECK-NEXT: [[CALL593:%.*]] = tail call zeroext i8 @patatino()
+; CHECK-NEXT: ret void
+;
+entry:
+ br label %for.cond93
+
+for.cond93.loopexit:
+ ret void
+
+for.cond93:
+ br label %for.body198
+
+for.body198:
+ %l_249.12 = phi i8 [ undef, %for.cond93 ], [ %call593, %for.body198 ]
+ %l_522.01 = phi i32 [ 0, %for.cond93 ], [ 1, %for.body198 ]
+ %call593 = tail call zeroext i8 @patatino()
+ br i1 false, label %for.body198, label %for.cond93.loopexit
+}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37153.112953.patch
Type: text/x-patch
Size: 2214 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170828/a6ea6a74/attachment.bin>
More information about the llvm-commits
mailing list