Skip to content

Commit e2ae7f8

Browse files
committed
!fixup Rename to RuntimeUnrolMultiExit
1 parent 5994463 commit e2ae7f8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

llvm/include/llvm/Analysis/TargetTransformInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ class TargetTransformInfo {
624624
unsigned SCEVExpansionBudget;
625625
/// Allow runtime unrolling multi-exit loops. Should only be set if the
626626
/// target determined that multi-exit unrolling is profitable for the loop.
627-
bool UnrollMultiExit;
627+
bool RuntimeUnrollMultiExit;
628628
};
629629

630630
/// Get target-customized preferences for the generic loop unrolling

llvm/include/llvm/Transforms/Utils/UnrollLoop.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct UnrollLoopOptions {
7676
bool ForgetAllSCEV;
7777
const Instruction *Heart = nullptr;
7878
unsigned SCEVExpansionBudget;
79-
bool UnrollMultiExit = false;
79+
bool RuntimeUnrollMultiExit = false;
8080
};
8181

8282
LoopUnrollResult UnrollLoop(Loop *L, UnrollLoopOptions ULO, LoopInfo *LI,
@@ -92,7 +92,7 @@ bool UnrollRuntimeLoopRemainder(
9292
bool UseEpilogRemainder, bool UnrollRemainder, bool ForgetAllSCEV,
9393
LoopInfo *LI, ScalarEvolution *SE, DominatorTree *DT, AssumptionCache *AC,
9494
const TargetTransformInfo *TTI, bool PreserveLCSSA,
95-
unsigned SCEVExpansionBudget, bool UnrollMultiExit,
95+
unsigned SCEVExpansionBudget, bool RuntimeUnrollMultiExit,
9696
Loop **ResultLoop = nullptr);
9797

9898
LoopUnrollResult UnrollAndJamLoop(Loop *L, unsigned Count, unsigned TripCount,

llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ TargetTransformInfo::UnrollingPreferences llvm::gatherUnrollingPreferences(
220220
UP.UnrollAndJamInnerLoopThreshold = 60;
221221
UP.MaxIterationsCountToAnalyze = UnrollMaxIterationsCountToAnalyze;
222222
UP.SCEVExpansionBudget = SCEVCheapExpansionBudget;
223-
UP.UnrollMultiExit = false;
223+
UP.RuntimeUnrollMultiExit = false;
224224

225225
// Override with any target specific settings
226226
TTI.getUnrollingPreferences(L, SE, UP, &ORE);
@@ -1353,7 +1353,7 @@ tryToUnrollLoop(Loop *L, DominatorTree &DT, LoopInfo *LI, ScalarEvolution &SE,
13531353
ULO.ForgetAllSCEV = ForgetAllSCEV;
13541354
ULO.Heart = getLoopConvergenceHeart(L);
13551355
ULO.SCEVExpansionBudget = UP.SCEVExpansionBudget;
1356-
ULO.UnrollMultiExit = UP.UnrollMultiExit;
1356+
ULO.RuntimeUnrollMultiExit = UP.RuntimeUnrollMultiExit;
13571357
LoopUnrollResult UnrollResult = UnrollLoop(
13581358
L, ULO, LI, &SE, &DT, &AC, &TTI, &ORE, PreserveLCSSA, &RemainderLoop, AA);
13591359
if (UnrollResult == LoopUnrollResult::Unmodified)

llvm/lib/Transforms/Utils/LoopUnroll.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ llvm::UnrollLoop(Loop *L, UnrollLoopOptions ULO, LoopInfo *LI,
594594
EpilogProfitability, ULO.UnrollRemainder,
595595
ULO.ForgetAllSCEV, LI, SE, DT, AC, TTI,
596596
PreserveLCSSA, ULO.SCEVExpansionBudget,
597-
ULO.UnrollMultiExit, RemainderLoop)) {
597+
ULO.RuntimeUnrollMultiExit, RemainderLoop)) {
598598
if (ULO.Force)
599599
ULO.Runtime = false;
600600
else {

llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ CloneLoopBlocks(Loop *L, Value *NewIter, const bool UseEpilogRemainder,
461461

462462
/// Returns true if we can profitably unroll the multi-exit loop L. Currently,
463463
/// we return true only if UnrollRuntimeMultiExit is set to true.
464-
static bool canProfitablyUnrollMultiExitLoop(
464+
static bool canProfitablyRuntimeUnrollMultiExitLoop(
465465
Loop *L, SmallVectorImpl<BasicBlock *> &OtherExits, BasicBlock *LatchExit,
466466
bool UseEpilogRemainder) {
467467

@@ -583,7 +583,7 @@ bool llvm::UnrollRuntimeLoopRemainder(
583583
bool UseEpilogRemainder, bool UnrollRemainder, bool ForgetAllSCEV,
584584
LoopInfo *LI, ScalarEvolution *SE, DominatorTree *DT, AssumptionCache *AC,
585585
const TargetTransformInfo *TTI, bool PreserveLCSSA,
586-
unsigned SCEVExpansionBudget, bool UnrollMultiExit, Loop **ResultLoop) {
586+
unsigned SCEVExpansionBudget, bool RuntimeUnrollMultiExit, Loop **ResultLoop) {
587587
LLVM_DEBUG(dbgs() << "Trying runtime unrolling on Loop: \n");
588588
LLVM_DEBUG(L->dump());
589589
LLVM_DEBUG(UseEpilogRemainder ? dbgs() << "Using epilog remainder.\n"
@@ -632,7 +632,7 @@ bool llvm::UnrollRuntimeLoopRemainder(
632632
if (!PreserveLCSSA)
633633
return false;
634634

635-
if (!UnrollMultiExit && !canProfitablyUnrollMultiExitLoop(
635+
if (!RuntimeUnrollMultiExit && !canProfitablyRuntimeUnrollMultiExitLoop(
636636
L, OtherExits, LatchExit, UseEpilogRemainder)) {
637637
LLVM_DEBUG(
638638
dbgs()

0 commit comments

Comments
 (0)