-
Notifications
You must be signed in to change notification settings - Fork 14.9k
[LoopUnroll] Rotate loop to make it countable for runtime unrolling #146540
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
e5aabbd
d49e403
9d8cd0b
7a41a6f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,6 +58,7 @@ | |
#include "llvm/Transforms/Utils/BasicBlockUtils.h" | ||
#include "llvm/Transforms/Utils/Cloning.h" | ||
#include "llvm/Transforms/Utils/Local.h" | ||
#include "llvm/Transforms/Utils/LoopRotationUtils.h" | ||
#include "llvm/Transforms/Utils/LoopSimplify.h" | ||
#include "llvm/Transforms/Utils/LoopUtils.h" | ||
#include "llvm/Transforms/Utils/SimplifyIndVar.h" | ||
|
@@ -484,8 +485,27 @@ llvm::UnrollLoop(Loop *L, UnrollLoopOptions ULO, LoopInfo *LI, | |
|
||
assert(ULO.Count > 0); | ||
|
||
// All these values should be taken only after peeling because they might have | ||
// changed. | ||
if (ULO.Runtime && SE) { | ||
BasicBlock *OrigHeader = L->getHeader(); | ||
BranchInst *BI = dyn_cast<BranchInst>(OrigHeader->getTerminator()); | ||
// Rotate loop if it makes it countable (for later unrolling) | ||
mark-sed marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
if (BI && !BI->isUnconditional() && | ||
isa<SCEVCouldNotCompute>(SE->getExitCount(L, L->getLoopLatch())) && | ||
!isa<SCEVCouldNotCompute>(SE->getExitCount(L, OrigHeader))) { | ||
LLVM_DEBUG(dbgs() << " Rotating loop to make the loop countable.\n"); | ||
SimplifyQuery SQ{OrigHeader->getDataLayout()}; | ||
SQ.TLI = nullptr; | ||
mark-sed marked this conversation as resolved.
Show resolved
Hide resolved
|
||
SQ.DT = DT; | ||
SQ.AC = AC; | ||
llvm::LoopRotation(L, LI, TTI, AC, DT, SE, nullptr /*MemorySSAUpdater*/, | ||
|
||
SQ, false /*RotationOnly*/, 16 /*Threshold*/, | ||
false /*IsUtilMode*/, false /*PrepareForLTO*/, | ||
[](Loop *, ScalarEvolution *) { return true; }); | ||
} | ||
} | ||
|
||
// All these values should be taken only after peeling or loop rotation | ||
// because they might have changed. | ||
BasicBlock *Preheader = L->getLoopPreheader(); | ||
BasicBlock *Header = L->getHeader(); | ||
BasicBlock *LatchBlock = L->getLoopLatch(); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5 | ||
; RUN: opt --passes=loop-unroll -unroll-runtime-other-exit-predictable=1 -S %s | FileCheck %s | ||
target triple = "x86_64-unknown-linux-gnu" | ||
|
||
define void @test(i64 %0) #0 { | ||
; CHECK-LABEL: define void @test( | ||
; CHECK-SAME: i64 [[TMP0:%.*]]) #[[ATTR0:[0-9]+]] { | ||
; CHECK-NEXT: [[ENTRY:.*:]] | ||
; CHECK-NEXT: [[B1:%.*]] = icmp eq i64 [[TMP0]], 0 | ||
; CHECK-NEXT: br i1 [[B1]], label %[[AFTER:.*]], label %[[BODY_LR_PH:.*]] | ||
; CHECK: [[BODY_LR_PH]]: | ||
; CHECK-NEXT: [[TMP1:%.*]] = sub i64 0, [[TMP0]] | ||
; CHECK-NEXT: [[TMP2:%.*]] = freeze i64 [[TMP1]] | ||
; CHECK-NEXT: [[TMP3:%.*]] = add i64 [[TMP2]], -1 | ||
; CHECK-NEXT: [[XTRAITER:%.*]] = and i64 [[TMP2]], 3 | ||
; CHECK-NEXT: [[LCMP_MOD:%.*]] = icmp ne i64 [[XTRAITER]], 0 | ||
; CHECK-NEXT: br i1 [[LCMP_MOD]], label %[[BODY_PROL_PREHEADER:.*]], label %[[BODY_PROL_LOOPEXIT:.*]] | ||
; CHECK: [[BODY_PROL_PREHEADER]]: | ||
; CHECK-NEXT: br label %[[BODY_PROL:.*]] | ||
; CHECK: [[BODY_PROL]]: | ||
; CHECK-NEXT: [[A2_PROL:%.*]] = phi i64 [ [[TMP0]], %[[BODY_PROL_PREHEADER]] ], [ [[A_PROL:%.*]], %[[HEADER_PROL:.*]] ] | ||
; CHECK-NEXT: [[PROL_ITER:%.*]] = phi i64 [ 0, %[[BODY_PROL_PREHEADER]] ], [ [[PROL_ITER_NEXT:%.*]], %[[HEADER_PROL]] ] | ||
; CHECK-NEXT: [[C_PROL:%.*]] = add i64 [[A2_PROL]], 1 | ||
; CHECK-NEXT: [[D_PROL:%.*]] = load i32, ptr addrspace(1) null, align 4 | ||
; CHECK-NEXT: [[E_PROL:%.*]] = icmp eq i32 [[D_PROL]], 0 | ||
; CHECK-NEXT: br i1 [[E_PROL]], label %[[END_LOOPEXIT3:.*]], label %[[HEADER_PROL]] | ||
; CHECK: [[HEADER_PROL]]: | ||
; CHECK-NEXT: [[A_PROL]] = phi i64 [ [[C_PROL]], %[[BODY_PROL]] ] | ||
; CHECK-NEXT: [[B_PROL:%.*]] = icmp eq i64 [[A_PROL]], 0 | ||
; CHECK-NEXT: [[PROL_ITER_NEXT]] = add i64 [[PROL_ITER]], 1 | ||
; CHECK-NEXT: [[PROL_ITER_CMP:%.*]] = icmp ne i64 [[PROL_ITER_NEXT]], [[XTRAITER]] | ||
; CHECK-NEXT: br i1 [[PROL_ITER_CMP]], label %[[BODY_PROL]], label %[[BODY_PROL_LOOPEXIT_UNR_LCSSA:.*]], !llvm.loop [[LOOP0:![0-9]+]] | ||
; CHECK: [[BODY_PROL_LOOPEXIT_UNR_LCSSA]]: | ||
; CHECK-NEXT: [[A2_UNR_PH:%.*]] = phi i64 [ [[A_PROL]], %[[HEADER_PROL]] ] | ||
; CHECK-NEXT: br label %[[BODY_PROL_LOOPEXIT]] | ||
; CHECK: [[BODY_PROL_LOOPEXIT]]: | ||
; CHECK-NEXT: [[A2_UNR:%.*]] = phi i64 [ [[TMP0]], %[[BODY_LR_PH]] ], [ [[A2_UNR_PH]], %[[BODY_PROL_LOOPEXIT_UNR_LCSSA]] ] | ||
; CHECK-NEXT: [[TMP4:%.*]] = icmp ult i64 [[TMP3]], 3 | ||
; CHECK-NEXT: br i1 [[TMP4]], label %[[HEADER_AFTER_CRIT_EDGE:.*]], label %[[BODY_LR_PH_NEW:.*]] | ||
; CHECK: [[BODY_LR_PH_NEW]]: | ||
; CHECK-NEXT: br label %[[BODY:.*]] | ||
; CHECK: [[HEADER:.*]]: | ||
; CHECK-NEXT: br i1 false, label %[[END_LOOPEXIT:.*]], label %[[HEADER_1:.*]] | ||
; CHECK: [[HEADER_1]]: | ||
; CHECK-NEXT: br i1 false, label %[[END_LOOPEXIT]], label %[[HEADER_2:.*]] | ||
; CHECK: [[HEADER_2]]: | ||
; CHECK-NEXT: [[C_7:%.*]] = add i64 [[A2:%.*]], 4 | ||
; CHECK-NEXT: br i1 false, label %[[END_LOOPEXIT]], label %[[HEADER_3:.*]] | ||
; CHECK: [[HEADER_3]]: | ||
; CHECK-NEXT: [[B_7:%.*]] = icmp eq i64 [[C_7]], 0 | ||
; CHECK-NEXT: br i1 [[B_7]], label %[[HEADER_AFTER_CRIT_EDGE_UNR_LCSSA:.*]], label %[[BODY]] | ||
; CHECK: [[BODY]]: | ||
; CHECK-NEXT: [[A2]] = phi i64 [ [[A2_UNR]], %[[BODY_LR_PH_NEW]] ], [ [[C_7]], %[[HEADER_3]] ] | ||
; CHECK-NEXT: [[D:%.*]] = load i32, ptr addrspace(1) null, align 4 | ||
; CHECK-NEXT: [[E:%.*]] = icmp eq i32 [[D]], 0 | ||
; CHECK-NEXT: br i1 [[E]], label %[[END_LOOPEXIT]], label %[[HEADER]] | ||
; CHECK: [[END_LOOPEXIT]]: | ||
; CHECK-NEXT: br label %[[END:.*]] | ||
; CHECK: [[END_LOOPEXIT3]]: | ||
; CHECK-NEXT: br label %[[END]] | ||
; CHECK: [[END]]: | ||
; CHECK-NEXT: ret void | ||
; CHECK: [[HEADER_AFTER_CRIT_EDGE_UNR_LCSSA]]: | ||
; CHECK-NEXT: br label %[[HEADER_AFTER_CRIT_EDGE]] | ||
; CHECK: [[HEADER_AFTER_CRIT_EDGE]]: | ||
; CHECK-NEXT: br label %[[AFTER]] | ||
; CHECK: [[AFTER]]: | ||
; CHECK-NEXT: call void @foo(i32 0) | ||
; CHECK-NEXT: ret void | ||
; | ||
entry: | ||
br label %header | ||
|
||
header: | ||
%a = phi i64 [ %0, %entry ], [ %c, %body ] | ||
%b = icmp eq i64 %a, 0 | ||
br i1 %b, label %after, label %body | ||
|
||
body: | ||
%c = add i64 %a, 1 | ||
%d = load i32, ptr addrspace(1) null, align 4 | ||
mark-sed marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
%e = icmp eq i32 %d, 0 | ||
br i1 %e, label %end, label %header | ||
|
||
end: | ||
ret void | ||
|
||
after: | ||
call void @foo(i32 0) | ||
mark-sed marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
ret void | ||
} | ||
|
||
declare void @foo(i32) | ||
|
||
attributes #0 = { "tune-cpu"="generic" } | ||
|
||
;. | ||
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]]} | ||
; CHECK: [[META1]] = !{!"llvm.loop.unroll.disable"} | ||
;. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Before attempting rotation, check that the loop has a preheader and a latch block to avoid potential null-pointer assertions inside
LoopRotation
.Copilot uses AI. Check for mistakes.