From 41b45ce656f3b3e0b281ad3f63e589d9d0f6fe2d Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Mon, 19 Dec 2022 20:37:47 +0000 Subject: [PATCH] [LV] Remove unused AAResults argument (NFC). AAResults is passed to LoopVectorizationLegality but no longer used. Remove the dead code. --- .../Transforms/Vectorize/LoopVectorizationLegality.h | 15 ++++++--------- .../llvm/Transforms/Vectorize/LoopVectorize.h | 15 +++++++-------- llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 20 +++++--------------- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h b/llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h index b0b9667..bbb73c6 100644 --- a/llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h +++ b/llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h @@ -240,15 +240,12 @@ private: /// induction variable and the different reduction variables. class LoopVectorizationLegality { public: - LoopVectorizationLegality(Loop *L, PredicatedScalarEvolution &PSE, - DominatorTree *DT, TargetTransformInfo *TTI, - TargetLibraryInfo *TLI, AAResults *AA, Function *F, - LoopAccessInfoManager &LAIs, LoopInfo *LI, - OptimizationRemarkEmitter *ORE, - LoopVectorizationRequirements *R, - LoopVectorizeHints *H, DemandedBits *DB, - AssumptionCache *AC, BlockFrequencyInfo *BFI, - ProfileSummaryInfo *PSI) + LoopVectorizationLegality( + Loop *L, PredicatedScalarEvolution &PSE, DominatorTree *DT, + TargetTransformInfo *TTI, TargetLibraryInfo *TLI, Function *F, + LoopAccessInfoManager &LAIs, LoopInfo *LI, OptimizationRemarkEmitter *ORE, + LoopVectorizationRequirements *R, LoopVectorizeHints *H, DemandedBits *DB, + AssumptionCache *AC, BlockFrequencyInfo *BFI, ProfileSummaryInfo *PSI) : TheLoop(L), LI(LI), PSE(PSE), TTI(TTI), TLI(TLI), DT(DT), LAIs(LAIs), ORE(ORE), Requirements(R), Hints(H), DB(DB), AC(AC), BFI(BFI), PSI(PSI) {} diff --git a/llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h b/llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h index 6679b2f..2f01276 100644 --- a/llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h +++ b/llvm/include/llvm/Transforms/Vectorize/LoopVectorize.h @@ -62,7 +62,6 @@ namespace llvm { -class AAResults; class AssumptionCache; class BlockFrequencyInfo; class DemandedBits; @@ -178,7 +177,6 @@ public: BlockFrequencyInfo *BFI; TargetLibraryInfo *TLI; DemandedBits *DB; - AAResults *AA; AssumptionCache *AC; LoopAccessInfoManager *LAIs; OptimizationRemarkEmitter *ORE; @@ -189,12 +187,13 @@ public: function_ref MapClassName2PassName); // Shim for old PM. - LoopVectorizeResult - runImpl(Function &F, ScalarEvolution &SE_, LoopInfo &LI_, - TargetTransformInfo &TTI_, DominatorTree &DT_, - BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_, DemandedBits &DB_, - AAResults &AA_, AssumptionCache &AC_, LoopAccessInfoManager &LAIs_, - OptimizationRemarkEmitter &ORE_, ProfileSummaryInfo *PSI_); + LoopVectorizeResult runImpl(Function &F, ScalarEvolution &SE_, LoopInfo &LI_, + TargetTransformInfo &TTI_, DominatorTree &DT_, + BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_, + DemandedBits &DB_, AssumptionCache &AC_, + LoopAccessInfoManager &LAIs_, + OptimizationRemarkEmitter &ORE_, + ProfileSummaryInfo *PSI_); bool processLoop(Loop *L); }; diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index a622ae1..c0c3c3b 100644 --- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -656,9 +656,6 @@ protected: /// Dominator Tree. DominatorTree *DT; - /// Alias Analysis. - AAResults *AA; - /// Target Library Info. const TargetLibraryInfo *TLI; @@ -2208,7 +2205,6 @@ struct LoopVectorize : public FunctionPass { auto *BFI = &getAnalysis().getBFI(); auto *TLIP = getAnalysisIfAvailable(); auto *TLI = TLIP ? &TLIP->getTLI(F) : nullptr; - auto *AA = &getAnalysis().getAAResults(); auto *AC = &getAnalysis().getAssumptionCache(F); auto &LAIs = getAnalysis().getLAIs(); auto *DB = &getAnalysis().getDemandedBits(); @@ -2216,8 +2212,7 @@ struct LoopVectorize : public FunctionPass { auto *PSI = &getAnalysis().getPSI(); return Impl - .runImpl(F, *SE, *LI, *TTI, *DT, *BFI, TLI, *DB, *AA, *AC, LAIs, *ORE, - PSI) + .runImpl(F, *SE, *LI, *TTI, *DT, *BFI, TLI, *DB, *AC, LAIs, *ORE, PSI) .MadeAnyChange; } @@ -2228,7 +2223,6 @@ struct LoopVectorize : public FunctionPass { AU.addRequired(); AU.addRequired(); AU.addRequired(); - AU.addRequired(); AU.addRequired(); AU.addRequired(); AU.addRequired(); @@ -7358,7 +7352,6 @@ static const char lv_name[] = "Loop Vectorization"; INITIALIZE_PASS_BEGIN(LoopVectorize, LV_NAME, lv_name, false, false) INITIALIZE_PASS_DEPENDENCY(TargetTransformInfoWrapperPass) INITIALIZE_PASS_DEPENDENCY(BasicAAWrapperPass) -INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass) INITIALIZE_PASS_DEPENDENCY(GlobalsAAWrapperPass) INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker) INITIALIZE_PASS_DEPENDENCY(BlockFrequencyInfoWrapperPass) @@ -10202,7 +10195,7 @@ bool LoopVectorizePass::processLoop(Loop *L) { // Check if it is legal to vectorize the loop. LoopVectorizationRequirements Requirements; - LoopVectorizationLegality LVL(L, PSE, DT, TTI, TLI, AA, F, *LAIs, LI, ORE, + LoopVectorizationLegality LVL(L, PSE, DT, TTI, TLI, F, *LAIs, LI, ORE, &Requirements, &Hints, DB, AC, BFI, PSI); if (!LVL.canVectorize(EnableVPlanNativePath)) { LLVM_DEBUG(dbgs() << "LV: Not vectorizing: Cannot prove legality.\n"); @@ -10562,16 +10555,14 @@ bool LoopVectorizePass::processLoop(Loop *L) { LoopVectorizeResult LoopVectorizePass::runImpl( Function &F, ScalarEvolution &SE_, LoopInfo &LI_, TargetTransformInfo &TTI_, DominatorTree &DT_, BlockFrequencyInfo &BFI_, TargetLibraryInfo *TLI_, - DemandedBits &DB_, AAResults &AA_, AssumptionCache &AC_, - LoopAccessInfoManager &LAIs_, OptimizationRemarkEmitter &ORE_, - ProfileSummaryInfo *PSI_) { + DemandedBits &DB_, AssumptionCache &AC_, LoopAccessInfoManager &LAIs_, + OptimizationRemarkEmitter &ORE_, ProfileSummaryInfo *PSI_) { SE = &SE_; LI = &LI_; TTI = &TTI_; DT = &DT_; BFI = &BFI_; TLI = TLI_; - AA = &AA_; AC = &AC_; LAIs = &LAIs_; DB = &DB_; @@ -10637,7 +10628,6 @@ PreservedAnalyses LoopVectorizePass::run(Function &F, auto &DT = AM.getResult(F); auto &BFI = AM.getResult(F); auto &TLI = AM.getResult(F); - auto &AA = AM.getResult(F); auto &AC = AM.getResult(F); auto &DB = AM.getResult(F); auto &ORE = AM.getResult(F); @@ -10647,7 +10637,7 @@ PreservedAnalyses LoopVectorizePass::run(Function &F, ProfileSummaryInfo *PSI = MAMProxy.getCachedResult(*F.getParent()); LoopVectorizeResult Result = - runImpl(F, SE, LI, TTI, DT, BFI, &TLI, DB, AA, AC, LAIs, ORE, PSI); + runImpl(F, SE, LI, TTI, DT, BFI, &TLI, DB, AC, LAIs, ORE, PSI); if (!Result.MadeAnyChange) return PreservedAnalyses::all(); PreservedAnalyses PA; -- 2.7.4