diff --git a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h index 71d81b5b7822..795f4cd746de 100644 --- a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h +++ b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h @@ -670,48 +670,10 @@ int getPtrStride(PredicatedScalarEvolution &PSE, Value *Ptr, const Loop *Lp, bool Assume = false); /// \brief Returns true if the memory operations \p A and \p B are consecutive. -/// This is a simple API that does not depend on the analysis pass. +/// This is a simple API that does not depend on the analysis pass. bool isConsecutiveAccess(Value *A, Value *B, const DataLayout &DL, ScalarEvolution &SE, bool CheckType = true); -/// \brief This class holds the result of LoopAccessAnalysis pass. -class LoopAccessAnalysisResult { -public: - void setDepAnalyses(AliasAnalysis *AA, DominatorTree *DT, LoopInfo *LI, - ScalarEvolution *SCEV, TargetLibraryInfo *TLI) { - this->AA = AA; - this->DT = DT; - this->LI = LI; - this->SCEV = SCEV; - this->TLI = TLI; - } - /// \brief Query the result of the loop access information for the loop \p L. - /// - /// If the client speculates (and then issues run-time checks) for the values - /// of symbolic strides, \p Strides provides the mapping (see - /// replaceSymbolicStrideSCEV). If there is no cached result available run - /// the analysis. - const LoopAccessInfo &getInfo(Loop *L, const ValueToValueMap &Strides); - - void print(raw_ostream &OS, const Module *M = nullptr) const; - - /// \brief Invalidate the cache when the pass is freed. - void releaseMemory() { - LoopAccessInfoMap.clear(); - } - -private: - /// \brief LoopAccessInfo is created on demand. This map caches - /// the computed results. - DenseMap> LoopAccessInfoMap; - - AliasAnalysis *AA = nullptr; - DominatorTree *DT = nullptr; - LoopInfo *LI = nullptr; - ScalarEvolution *SCEV = nullptr; - TargetLibraryInfo *TLI = nullptr; -}; - /// \brief This analysis provides dependence information for the memory accesses /// of a loop. /// @@ -723,7 +685,7 @@ class LoopAccessAnalysis : public FunctionPass { public: static char ID; - LoopAccessAnalysis() : FunctionPass(ID), LAAR() { + LoopAccessAnalysis() : FunctionPass(ID) { initializeLoopAccessAnalysisPass(*PassRegistry::getPassRegistry()); } @@ -731,20 +693,32 @@ public: void getAnalysisUsage(AnalysisUsage &AU) const override; - LoopAccessAnalysisResult &getResult() { return LAAR; } + /// \brief Query the result of the loop access information for the loop \p L. + /// + /// If the client speculates (and then issues run-time checks) for the values + /// of symbolic strides, \p Strides provides the mapping (see + /// replaceSymbolicStrideSCEV). If there is no cached result available run + /// the analysis. + const LoopAccessInfo &getInfo(Loop *L, const ValueToValueMap &Strides); void releaseMemory() override { // Invalidate the cache when the pass is freed. - LAAR.releaseMemory(); + LoopAccessInfoMap.clear(); } /// \brief Print the result of the analysis when invoked with -analyze. - void print(raw_ostream &OS, const Module *M = nullptr) const override { - LAAR.print(OS, M); - } + void print(raw_ostream &OS, const Module *M = nullptr) const override; private: - LoopAccessAnalysisResult LAAR; + /// \brief The cache. + DenseMap> LoopAccessInfoMap; + + // The used analysis passes. + ScalarEvolution *SE; + const TargetLibraryInfo *TLI; + AliasAnalysis *AA; + DominatorTree *DT; + LoopInfo *LI; }; inline Instruction *MemoryDepChecker::Dependence::getSource( diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp index 23e913a07bb2..ff5bc595da5d 100644 --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -1932,7 +1932,7 @@ void LoopAccessInfo::print(raw_ostream &OS, unsigned Depth) const { } const LoopAccessInfo & -LoopAccessAnalysisResult::getInfo(Loop *L, const ValueToValueMap &Strides) { +LoopAccessAnalysis::getInfo(Loop *L, const ValueToValueMap &Strides) { auto &LAI = LoopAccessInfoMap[L]; #ifndef NDEBUG @@ -1942,8 +1942,8 @@ LoopAccessAnalysisResult::getInfo(Loop *L, const ValueToValueMap &Strides) { if (!LAI) { const DataLayout &DL = L->getHeader()->getModule()->getDataLayout(); - LAI = llvm::make_unique(L, SCEV, DL, TLI, AA, DT, LI, - Strides); + LAI = + llvm::make_unique(L, SE, DL, TLI, AA, DT, LI, Strides); #ifndef NDEBUG LAI->NumSymbolicStrides = Strides.size(); #endif @@ -1951,25 +1951,26 @@ LoopAccessAnalysisResult::getInfo(Loop *L, const ValueToValueMap &Strides) { return *LAI.get(); } -void LoopAccessAnalysisResult::print(raw_ostream &OS, const Module *M) const { +void LoopAccessAnalysis::print(raw_ostream &OS, const Module *M) const { + LoopAccessAnalysis &LAA = *const_cast(this); + ValueToValueMap NoSymbolicStrides; for (Loop *TopLevelLoop : *LI) for (Loop *L : depth_first(TopLevelLoop)) { OS.indent(2) << L->getHeader()->getName() << ":\n"; - auto &LAI = const_cast(this)->getInfo( - L, NoSymbolicStrides); + auto &LAI = LAA.getInfo(L, NoSymbolicStrides); LAI.print(OS, 4); } } bool LoopAccessAnalysis::runOnFunction(Function &F) { + SE = &getAnalysis().getSE(); auto *TLIP = getAnalysisIfAvailable(); - LAAR.setDepAnalyses(&getAnalysis().getAAResults(), - &getAnalysis().getDomTree(), - &getAnalysis().getLoopInfo(), - &getAnalysis().getSE(), - TLIP ? &TLIP->getTLI() : nullptr); + TLI = TLIP ? &TLIP->getTLI() : nullptr; + AA = &getAnalysis().getAAResults(); + DT = &getAnalysis().getDomTree(); + LI = &getAnalysis().getLoopInfo(); return false; } diff --git a/llvm/lib/Transforms/Scalar/LoopDistribute.cpp b/llvm/lib/Transforms/Scalar/LoopDistribute.cpp index 3d82eb824820..48405a2b721a 100644 --- a/llvm/lib/Transforms/Scalar/LoopDistribute.cpp +++ b/llvm/lib/Transforms/Scalar/LoopDistribute.cpp @@ -608,7 +608,7 @@ public: return fail("multiple exit blocks"); // LAA will check that we only have a single exiting block. - LAI = &LAA->getResult().getInfo(L, ValueToValueMap()); + LAI = &LAA->getInfo(L, ValueToValueMap()); // Currently, we only distribute to isolate the part of the loop with // dependence cycles to enable partial vectorization. diff --git a/llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp b/llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp index 32c0bd63a4bc..8f2b3acabb6c 100644 --- a/llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp +++ b/llvm/lib/Transforms/Scalar/LoopLoadElimination.cpp @@ -552,7 +552,7 @@ public: // Now walk the identified inner loops. bool Changed = false; for (Loop *L : Worklist) { - const LoopAccessInfo &LAI = LAA->getResult().getInfo(L, ValueToValueMap()); + const LoopAccessInfo &LAI = LAA->getInfo(L, ValueToValueMap()); // The actual work is performed by LoadEliminationForLoop. LoadEliminationForLoop LEL(L, LI, LAI, DT); Changed |= LEL.processLoop(); diff --git a/llvm/lib/Transforms/Scalar/LoopVersioningLICM.cpp b/llvm/lib/Transforms/Scalar/LoopVersioningLICM.cpp index dab4ba16714d..7ccf2271e624 100644 --- a/llvm/lib/Transforms/Scalar/LoopVersioningLICM.cpp +++ b/llvm/lib/Transforms/Scalar/LoopVersioningLICM.cpp @@ -411,7 +411,7 @@ bool LoopVersioningLICM::legalLoopInstructions() { return false; } // Get LoopAccessInfo from current loop. - LAI = &LAA->getResult().getInfo(CurLoop, Strides); + LAI = &LAA->getInfo(CurLoop, Strides); // Check LoopAccessInfo for need of runtime check. if (LAI->getRuntimePointerChecking()->getChecks().empty()) { DEBUG(dbgs() << " LAA: Runtime check not found !!\n"); diff --git a/llvm/lib/Transforms/Utils/LoopVersioning.cpp b/llvm/lib/Transforms/Utils/LoopVersioning.cpp index 3e677d8ad534..736d79ad81cf 100644 --- a/llvm/lib/Transforms/Utils/LoopVersioning.cpp +++ b/llvm/lib/Transforms/Utils/LoopVersioning.cpp @@ -268,7 +268,7 @@ public: // Now walk the identified inner loops. bool Changed = false; for (Loop *L : Worklist) { - const LoopAccessInfo &LAI = LAA->getResult().getInfo(L, ValueToValueMap()); + const LoopAccessInfo &LAI = LAA->getInfo(L, ValueToValueMap()); if (LAI.getNumRuntimePointerChecks() || !LAI.PSE.getUnionPredicate().isAlwaysTrue()) { LoopVersioning LVer(LAI, L, LI, DT, SE); diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 78ea58cf4995..144eab58f74d 100644 --- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -4931,7 +4931,7 @@ void LoopVectorizationLegality::collectLoopUniforms() { } bool LoopVectorizationLegality::canVectorizeMemory() { - LAI = &LAA->getResult().getInfo(TheLoop, Strides); + LAI = &LAA->getInfo(TheLoop, Strides); auto &OptionalReport = LAI->getReport(); if (OptionalReport) emitAnalysis(VectorizationReport(*OptionalReport));