Skip to content

Commit 41b45ce

Browse files
committed
[LV] Remove unused AAResults argument (NFC).
AAResults is passed to LoopVectorizationLegality but no longer used. Remove the dead code.
1 parent a7cb02d commit 41b45ce

File tree

3 files changed

+18
-32
lines changed

3 files changed

+18
-32
lines changed

llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,12 @@ class LoopVectorizationRequirements {
240240
/// induction variable and the different reduction variables.
241241
class LoopVectorizationLegality {
242242
public:
243-
LoopVectorizationLegality(Loop *L, PredicatedScalarEvolution &PSE,
244-
DominatorTree *DT, TargetTransformInfo *TTI,
245-
TargetLibraryInfo *TLI, AAResults *AA, Function *F,
246-
LoopAccessInfoManager &LAIs, LoopInfo *LI,
247-
OptimizationRemarkEmitter *ORE,
248-
LoopVectorizationRequirements *R,
249-
LoopVectorizeHints *H, DemandedBits *DB,
250-
AssumptionCache *AC, BlockFrequencyInfo *BFI,
251-
ProfileSummaryInfo *PSI)
243+
LoopVectorizationLegality(
244+
Loop *L, PredicatedScalarEvolution &PSE, DominatorTree *DT,
245+
TargetTransformInfo *TTI, TargetLibraryInfo *TLI, Function *F,
246+
LoopAccessInfoManager &LAIs, LoopInfo *LI, OptimizationRemarkEmitter *ORE,
247+
LoopVectorizationRequirements *R, LoopVectorizeHints *H, DemandedBits *DB,
248+
AssumptionCache *AC, BlockFrequencyInfo *BFI, ProfileSummaryInfo *PSI)
252249
: TheLoop(L), LI(LI), PSE(PSE), TTI(TTI), TLI(TLI), DT(DT), LAIs(LAIs),
253250
ORE(ORE), Requirements(R), Hints(H), DB(DB), AC(AC), BFI(BFI),
254251
PSI(PSI) {}

llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262

6363
namespace llvm {
6464

65-
class AAResults;
6665
class AssumptionCache;
6766
class BlockFrequencyInfo;
6867
class DemandedBits;
@@ -178,7 +177,6 @@ struct LoopVectorizePass : public PassInfoMixin<LoopVectorizePass> {
178177
BlockFrequencyInfo *BFI;
179178
TargetLibraryInfo *TLI;
180179
DemandedBits *DB;
181-
AAResults *AA;
182180
AssumptionCache *AC;
183181
LoopAccessInfoManager *LAIs;
184182
OptimizationRemarkEmitter *ORE;
@@ -189,12 +187,13 @@ struct LoopVectorizePass : public PassInfoMixin<LoopVectorizePass> {
189187
function_ref<StringRef(StringRef)> MapClassName2PassName);
190188

191189
// Shim for old PM.
192-
LoopVectorizeResult
193-
runImpl(Function &F, ScalarEvolution &SE_, LoopInfo &LI_,
194-
TargetTransformInfo &TTI_, DominatorTree &DT_,
195-
BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_, DemandedBits &DB_,
196-
AAResults &AA_, AssumptionCache &AC_, LoopAccessInfoManager &LAIs_,
197-
OptimizationRemarkEmitter &ORE_, ProfileSummaryInfo *PSI_);
190+
LoopVectorizeResult runImpl(Function &F, ScalarEvolution &SE_, LoopInfo &LI_,
191+
TargetTransformInfo &TTI_, DominatorTree &DT_,
192+
BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_,
193+
DemandedBits &DB_, AssumptionCache &AC_,
194+
LoopAccessInfoManager &LAIs_,
195+
OptimizationRemarkEmitter &ORE_,
196+
ProfileSummaryInfo *PSI_);
198197

199198
bool processLoop(Loop *L);
200199
};

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,6 @@ class InnerLoopVectorizer {
656656
/// Dominator Tree.
657657
DominatorTree *DT;
658658

659-
/// Alias Analysis.
660-
AAResults *AA;
661-
662659
/// Target Library Info.
663660
const TargetLibraryInfo *TLI;
664661

@@ -2208,16 +2205,14 @@ struct LoopVectorize : public FunctionPass {
22082205
auto *BFI = &getAnalysis<BlockFrequencyInfoWrapperPass>().getBFI();
22092206
auto *TLIP = getAnalysisIfAvailable<TargetLibraryInfoWrapperPass>();
22102207
auto *TLI = TLIP ? &TLIP->getTLI(F) : nullptr;
2211-
auto *AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
22122208
auto *AC = &getAnalysis<AssumptionCacheTracker>().getAssumptionCache(F);
22132209
auto &LAIs = getAnalysis<LoopAccessLegacyAnalysis>().getLAIs();
22142210
auto *DB = &getAnalysis<DemandedBitsWrapperPass>().getDemandedBits();
22152211
auto *ORE = &getAnalysis<OptimizationRemarkEmitterWrapperPass>().getORE();
22162212
auto *PSI = &getAnalysis<ProfileSummaryInfoWrapperPass>().getPSI();
22172213

22182214
return Impl
2219-
.runImpl(F, *SE, *LI, *TTI, *DT, *BFI, TLI, *DB, *AA, *AC, LAIs, *ORE,
2220-
PSI)
2215+
.runImpl(F, *SE, *LI, *TTI, *DT, *BFI, TLI, *DB, *AC, LAIs, *ORE, PSI)
22212216
.MadeAnyChange;
22222217
}
22232218

@@ -2228,7 +2223,6 @@ struct LoopVectorize : public FunctionPass {
22282223
AU.addRequired<LoopInfoWrapperPass>();
22292224
AU.addRequired<ScalarEvolutionWrapperPass>();
22302225
AU.addRequired<TargetTransformInfoWrapperPass>();
2231-
AU.addRequired<AAResultsWrapperPass>();
22322226
AU.addRequired<LoopAccessLegacyAnalysis>();
22332227
AU.addRequired<DemandedBitsWrapperPass>();
22342228
AU.addRequired<OptimizationRemarkEmitterWrapperPass>();
@@ -7358,7 +7352,6 @@ static const char lv_name[] = "Loop Vectorization";
73587352
INITIALIZE_PASS_BEGIN(LoopVectorize, LV_NAME, lv_name, false, false)
73597353
INITIALIZE_PASS_DEPENDENCY(TargetTransformInfoWrapperPass)
73607354
INITIALIZE_PASS_DEPENDENCY(BasicAAWrapperPass)
7361-
INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
73627355
INITIALIZE_PASS_DEPENDENCY(GlobalsAAWrapperPass)
73637356
INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker)
73647357
INITIALIZE_PASS_DEPENDENCY(BlockFrequencyInfoWrapperPass)
@@ -10202,7 +10195,7 @@ bool LoopVectorizePass::processLoop(Loop *L) {
1020210195

1020310196
// Check if it is legal to vectorize the loop.
1020410197
LoopVectorizationRequirements Requirements;
10205-
LoopVectorizationLegality LVL(L, PSE, DT, TTI, TLI, AA, F, *LAIs, LI, ORE,
10198+
LoopVectorizationLegality LVL(L, PSE, DT, TTI, TLI, F, *LAIs, LI, ORE,
1020610199
&Requirements, &Hints, DB, AC, BFI, PSI);
1020710200
if (!LVL.canVectorize(EnableVPlanNativePath)) {
1020810201
LLVM_DEBUG(dbgs() << "LV: Not vectorizing: Cannot prove legality.\n");
@@ -10562,16 +10555,14 @@ bool LoopVectorizePass::processLoop(Loop *L) {
1056210555
LoopVectorizeResult LoopVectorizePass::runImpl(
1056310556
Function &F, ScalarEvolution &SE_, LoopInfo &LI_, TargetTransformInfo &TTI_,
1056410557
DominatorTree &DT_, BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_,
10565-
DemandedBits &DB_, AAResults &AA_, AssumptionCache &AC_,
10566-
LoopAccessInfoManager &LAIs_, OptimizationRemarkEmitter &ORE_,
10567-
ProfileSummaryInfo *PSI_) {
10558+
DemandedBits &DB_, AssumptionCache &AC_, LoopAccessInfoManager &LAIs_,
10559+
OptimizationRemarkEmitter &ORE_, ProfileSummaryInfo *PSI_) {
1056810560
SE = &SE_;
1056910561
LI = &LI_;
1057010562
TTI = &TTI_;
1057110563
DT = &DT_;
1057210564
BFI = &BFI_;
1057310565
TLI = TLI_;
10574-
AA = &AA_;
1057510566
AC = &AC_;
1057610567
LAIs = &LAIs_;
1057710568
DB = &DB_;
@@ -10637,7 +10628,6 @@ PreservedAnalyses LoopVectorizePass::run(Function &F,
1063710628
auto &DT = AM.getResult<DominatorTreeAnalysis>(F);
1063810629
auto &BFI = AM.getResult<BlockFrequencyAnalysis>(F);
1063910630
auto &TLI = AM.getResult<TargetLibraryAnalysis>(F);
10640-
auto &AA = AM.getResult<AAManager>(F);
1064110631
auto &AC = AM.getResult<AssumptionAnalysis>(F);
1064210632
auto &DB = AM.getResult<DemandedBitsAnalysis>(F);
1064310633
auto &ORE = AM.getResult<OptimizationRemarkEmitterAnalysis>(F);
@@ -10647,7 +10637,7 @@ PreservedAnalyses LoopVectorizePass::run(Function &F,
1064710637
ProfileSummaryInfo *PSI =
1064810638
MAMProxy.getCachedResult<ProfileSummaryAnalysis>(*F.getParent());
1064910639
LoopVectorizeResult Result =
10650-
runImpl(F, SE, LI, TTI, DT, BFI, &TLI, DB, AA, AC, LAIs, ORE, PSI);
10640+
runImpl(F, SE, LI, TTI, DT, BFI, &TLI, DB, AC, LAIs, ORE, PSI);
1065110641
if (!Result.MadeAnyChange)
1065210642
return PreservedAnalyses::all();
1065310643
PreservedAnalyses PA;

0 commit comments

Comments
 (0)