[new PM] port LoopAccessAnalysis to new pass manager (part-1)

[davidxl]

Summary

part-1 is a NFC refactoring patch to enable porting. Changes include

1. renamed LoopAccessAnalysis.h to be LoopAccessInfo.h
2. split out LoopAccessAnalysis class into new file LoopAccessAnalysis.h
3. introduced LoopAccessFuncInfo class to represent function level analysis result of LoopAccess infos
4. machinery to support lazy computation of LoopAccessInfo

[davidxl]

ping ..

[chandlerc]

The number of different changes here make it really hard to review.

Can you instead actually send out the individual changes?

I also don't see any benefit to renaming the file. I think the "Info" suffix, as common as it is in LLVM, is probably a mistake. I'm not sure its worth going and fixing everything to use a different suffix, but I like the current file name better than the one you propose here. (Just my opinion, if others have a different view from working more closely with the loop access stuff or vectorization stuff, totally fine with that...)

[llvm-commits]

The renaming also makes the diff hard to read which I don't like either. I
will revert the renaming part.

thanks,

David

• msg-31405-77.txt162 BDownload

[davidxl]

Addressed review comments: do not rename existing header file and minimizes diffs.

PTAL

[chandlerc]

In D20560#450653, @davidxl wrote:

Addressed review comments: do not rename existing header file and minimizes diffs.

PTAL

I'm not sure what is expected to be changing here? There are four things in your patch description, and my suggestion was to split them apart. It looks like this isn't split apart, just adjusted?

I'm also not sure why you're adding the file to LoopAccessInfoAnalysis.h?

Maybe it would help to provide an updated over-all summary? I feel like I may just not understand what is going on here.

[davidxl]

New summary of the change:

1. split the legacy LoopAccess Analysis pass out of the header file LoopAccessAnalysis.h
2. introduced a new class LoopAccessFuncInfo that represents the function level analysis results that is cacheble.
3. move the interfaces that access the loop level LoopAccessInfo from legacy pass class to the new LoopAccessFuncInfo class
4. change clients to use the new interfaces

Does it make sense?

[chandlerc]

Thanks, this definitely helps.

In D20560#450661, @davidxl wrote:

New summary of the change:

1. split the legacy LoopAccess Analysis pass out of the header file LoopAccessAnalysis.h

Any particular reason to split these apart? It would seem simpler to just do the refactoring in place in the header file...

2. introduced a new class LoopAccessFuncInfo that represents the function level analysis results that is cacheble.

Makes sense. I'd probably call it LoopAccessInfo to fit with the common pattern, but I'm happy if there are reasons to name this differently.

3. move the interfaces that access the loop level LoopAccessInfo from legacy pass class to the new LoopAccessFuncInfo class
4. change clients to use the new interfaces

Does it make sense?

Yep. See one question on the code I have initially below...

include/llvm/Analysis/LoopAccessInfoAnalysis.h

36–45

Why this pattern?

Specifically, why deviate from the pattern that other analyses that have been ported use where you just construct the result class with pointers to the various other analysis results they reference?

Introducing a complete abstract interface seems like a much heavier weight abstraction; unless there is a specific problem solved, I'd rather the lighter weight abstraction.

[davidxl]

Addressed Chandler's feedback.

[anemet]

lib/Transforms/Scalar/LoopDistribute.cpp

611

getInfo().getInfo(...), really?

What is the difference between LAFI and LAA conceptually?

Without knowing much about the new PM, I see that you split out the cache from LAA (which was pretty much all it contained).

Should this perhaps be:

LAA->getCache().getInfo(..)

or getLoopInfo(..)

?

[davide]

include/llvm/Analysis/LoopAccessAnalysis.h

683

I'm not entirely sure what's the preferred LLVM style here, but I seldom (if ever) have seen variables ending with _ used like this.
I might miss something (and certainly I didn't compile), but, won't
this.AAR = AAR et similia work?

700

Move this outside of the function, and make it doxygen, i.e.
\brief Invalidate the cache when this pass is freed

705

This comment is too generic to be somehow useful. I think it should be expanded a bit, while you're here.

708

Why AAR and not AA as it was before? Also more consistent with how other variables are named.

lib/Analysis/LoopAccessAnalysis.cpp

1966

As you're passing getAnalysis everywhere, can't you also inline
TLIP ? &TLIP->getTLI() : nullptr instead of assigning TLI and passing the variable?

lib/Transforms/Scalar/LoopLoadElimination.cpp

555

I agree with Adam here, the getInfo().getInfo() is just very weird

[davidxl]

Addressed Adam and Davide's review comments.

[anemet]

I am fine with this with comments below addressed. Thanks!

include/llvm/Analysis/LoopAccessAnalysis.h

677

This needs a class comment. Also what do you think about naming this Result as well, i.e. LoopAccessAnalysisResult?

679–680

You don't need to call the default ctor for LAIM like this. Also you may want to use in-class data member initializers for the nullptrs and then remove the ctor altogether.

[davidxl]

Addressed Adam's feedback.

[anemet]

LGTM with the change below.

include/llvm/Analysis/LoopAccessAnalysis.h

675–676

s/LAFI/LAAR

[davide]

LGTM once you address Adam's last comment. Thanks for your patience.

[chandlerc]

At a meta level, if I've started reviewing a patch, please wait until I have a chance to see your updates before submitting it. I'm sorry I didn't get to it in the early morning, but its still well under 24h turn around and I don't know that its reasonable to expect lower latency.

That's not to say that I don't appreciate all of Adam and Davide's comments -- they're help reviewing is much appreciated -- but as it happens I don't actually think this is the right approach.

See below for more details.

llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h

704–706 ↗

(On Diff #60092)

This doesn't seem like the right design. It leads to the getInfo().getInfo() awkward pattern that IMO is only marginally less awkward spelled as getResult().getInfo().

Instead, I think this pretty clearly wants to be a Loop analysis in the new pass manager. I think that the caching and map should be the new pass manager's caching and map, rather than rolling our own in a function analysis manager.

As a consequence, I don't think you need this result type at all. I think the LoopAccessInfo is already the correct result type. I think you'll need the DenseMap and logic around it in the legacy pass manager's function analysis, and you'll want a different query path to use the LoopAnalysisManager directly in the new pass manager.

Does that make sense?

[anemet]

llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h

704–706 ↗

(On Diff #60092)

Just for the record, this had to be a function pass because the loop vectorizer is a function pass with the legacy PM.

It would be great to turn this into a loop pass with the new PM.

include/llvm/Analysis/LoopAccessAnalysis.h

 //===- llvm/Analysis/LoopAccessAnalysis.h -----------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the interface for the loop memory dependence framework that
 // was originally developed for the Loop Vectorizer.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ANALYSIS_LOOPACCESSANALYSIS_H
-#define LLVM_ANALYSIS_LOOPACCESSANALYSIS_H
+#ifndef LLVM_ANALYSIS_LOOPACCESSINFO_H
+#define LLVM_ANALYSIS_LOOPACCESSINFO_H
 
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/AliasSetTracker.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
 #include "llvm/IR/ValueHandle.h"
-#include "llvm/Pass.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 
 class Value;
 class DataLayout;
 class ScalarEvolution;
 class Loop;

 /// to \p PtrToStride and therefore add further predicates to \p PSE.
 /// The \p Assume parameter indicates if we are allowed to make additional
 /// run-time assumptions.
 int getPtrStride(PredicatedScalarEvolution &PSE, Value *Ptr, const Loop *Lp,
                  const ValueToValueMap &StridesMap = ValueToValueMap(),
                  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 analysis provides dependence information for the memory accesses
-/// of a loop.
-///
-/// It runs the analysis for a loop on demand.  This can be initiated by
-/// querying the loop access info via LAA::getInfo.  getInfo return a
-/// LoopAccessInfo object.  See this class for the specifics of what information
-/// is provided.
-class LoopAccessAnalysis : public FunctionPass {
-public:
-  static char ID;
-
-  LoopAccessAnalysis() : FunctionPass(ID) {
-    initializeLoopAccessAnalysisPass(*PassRegistry::getPassRegistry());
-  }
-
-  bool runOnFunction(Function &F) override;
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override;
-
-  /// \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.
-    LoopAccessInfoMap.clear();
-  }
-
-  /// \brief Print the result of the analysis when invoked with -analyze.
-  void print(raw_ostream &OS, const Module *M = nullptr) const override;
-
-private:
-  /// \brief The cache.
-  DenseMap<Loop *, std::unique_ptr<LoopAccessInfo>> LoopAccessInfoMap;
-
-  // The used analysis passes.
-  ScalarEvolution *SE;
-  const TargetLibraryInfo *TLI;
-  AliasAnalysis *AA;
-  DominatorTree *DT;
-  LoopInfo *LI;
-};
-
-inline Instruction *MemoryDepChecker::Dependence::getSource(
-    const LoopAccessInfo &LAI) const {
+inline Instruction *
+MemoryDepChecker::Dependence::getSource(const LoopAccessInfo &LAI) const {
   return LAI.getDepChecker().getMemoryInstructions()[Source];
 }
 
 inline Instruction *MemoryDepChecker::Dependence::getDestination(
     const LoopAccessInfo &LAI) const {
   return LAI.getDepChecker().getMemoryInstructions()[Destination];
 }
 
 } // End llvm namespace
 
 #endif

include/llvm/Analysis/LoopAccessInfoAnalysis.h

+//===- llvm/Analysis/LoopAccessInfoAnalysis.h -------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the interface for the loop memory dependence framework that
+// was originally developed for the Loop Vectorizer.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_ANALYSIS_LOOPACCESSINFOANALYSIS_H
+#define LLVM_ANALYSIS_LOOPACCESSINFOANALYSIS_H
+
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/InitializePasses.h"
+#include "llvm/Pass.h"
+
+namespace llvm {
+
+class DominatorTree;
+class Loop;
+class LoopAccessInfo;
+class LoopInfo;
+class ScalarEvolution;
+class TargetLibraryInfo;
+class Value;
+
+typedef DenseMap<const Value *, Value *> ValueToValueMap;
+
+// Analysis manager base
+class LoopAccessAMBase {
+public:
+  virtual TargetLibraryInfo *getTLI() = 0;
+  virtual AliasAnalysis *getAAResults() = 0;
+  virtual DominatorTree *getDominatorTree() = 0;
+  virtual LoopInfo *getLoopInfo() = 0;
+  virtual ScalarEvolution *getSCEV() = 0;
+  virtual ~LoopAccessAMBase() {}
+};
+
+class LoopAccessFuncInfo {
+public:
+  LoopAccessFuncInfo() : LoopAccessInfoMap(), AM(nullptr) {}
+  /// \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;
+
+  void releaseMemory() {
+    // Invalidate the cache when the pass is freed.
+    LoopAccessInfoMap.clear();
+  }
+
+  void setAM(LoopAccessAMBase *AM_) { AM.reset(AM_); }
+
+private:
+  /// \brief The cache.
+  DenseMap<Loop *, std::unique_ptr<LoopAccessInfo>> LoopAccessInfoMap;
+  std::unique_ptr<LoopAccessAMBase> AM;
+};
+
+/// \brief This analysis provides dependence information for the memory accesses
+/// of a loop.
+///
+/// It runs the analysis for a loop on demand.  This can be initiated by
+/// querying the loop access info via LAA::getInfo.  getInfo return a
+/// LoopAccessInfo object.  See this class for the specifics of what information
+/// is provided.
+class LoopAccessAnalysis : public FunctionPass {
+public:
+  static char ID;
+
+  LoopAccessAnalysis() : FunctionPass(ID), LAFI() {
+    initializeLoopAccessAnalysisPass(*PassRegistry::getPassRegistry());
+  }
+
+  bool runOnFunction(Function &F) override;
+
+  void getAnalysisUsage(AnalysisUsage &AU) const override;
+
+  LoopAccessFuncInfo &getInfo() { return LAFI; }
+
+  void releaseMemory() override {
+    // Invalidate the cache when the pass is freed.
+    LAFI.releaseMemory();
+  }
+
+  /// \brief Print the result of the analysis when invoked with -analyze.
+  void print(raw_ostream &OS, const Module *M = nullptr) const override {
+    LAFI.print(OS, M);
+  }
+
+private:
+  LoopAccessFuncInfo LAFI;
+};
+
+} // End llvm namespace
+
+#endif

include/llvm/Transforms/Utils/LoopVersioning.h

 // emits checks to prove this.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_TRANSFORMS_UTILS_LOOPVERSIONING_H
 #define LLVM_TRANSFORMS_UTILS_LOOPVERSIONING_H
 
 #include "llvm/Analysis/LoopAccessAnalysis.h"
+#include "llvm/Analysis/LoopAccessInfoAnalysis.h"
 #include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Transforms/Utils/ValueMapper.h"
 #include "llvm/Transforms/Utils/LoopUtils.h"
+#include "llvm/Transforms/Utils/ValueMapper.h"
 
 namespace llvm {
 
 class Loop;
 class LoopAccessInfo;
 class LoopInfo;
 class ScalarEvolution;
 

lib/Analysis/LoopAccessAnalysis.cpp

 //===- LoopAccessAnalysis.cpp - Loop Access Analysis Implementation --------==//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // The implementation for the loop memory dependence that was originally
 // developed for the loop vectorizer.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/LoopAccessAnalysis.h"
+#include "llvm/Analysis/LoopAccessInfoAnalysis.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/ScalarEvolutionExpander.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
+#include "llvm/Analysis/VectorUtils.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Analysis/VectorUtils.h"
 using namespace llvm;
 
 #define DEBUG_TYPE "loop-accesses"
 
 static cl::opt<unsigned, true>
 VectorizationFactor("force-vector-width", cl::Hidden,
                     cl::desc("Sets the SIMD width. Zero is autoselect."),
                     cl::location(VectorizerParams::VectorizationFactor));
void LoopAccessInfo::print(raw_ostream &OS, unsigned Depth) const {
 
   OS << "\n";
 
   OS.indent(Depth) << "Expressions re-written:\n";
   PSE.print(OS, Depth);
 }
 
 const LoopAccessInfo &
-LoopAccessAnalysis::getInfo(Loop *L, const ValueToValueMap &Strides) {
+LoopAccessFuncInfo::getInfo(Loop *L, const ValueToValueMap &Strides) {
   auto &LAI = LoopAccessInfoMap[L];
 
 #ifndef NDEBUG
   assert((!LAI || LAI->NumSymbolicStrides == Strides.size()) &&
          "Symbolic strides changed for loop");
 #endif
 
   if (!LAI) {
     const DataLayout &DL = L->getHeader()->getModule()->getDataLayout();
-    LAI =
-        llvm::make_unique<LoopAccessInfo>(L, SE, DL, TLI, AA, DT, LI, Strides);
+    LAI = llvm::make_unique<LoopAccessInfo>(
+        L, AM->getSCEV(), DL, AM->getTLI(), AM->getAAResults(),
+        AM->getDominatorTree(), AM->getLoopInfo(), Strides);
 #ifndef NDEBUG
     LAI->NumSymbolicStrides = Strides.size();
 #endif
   }
   return *LAI.get();
 }
 
-void LoopAccessAnalysis::print(raw_ostream &OS, const Module *M) const {
-  LoopAccessAnalysis &LAA = *const_cast<LoopAccessAnalysis *>(this);
+void LoopAccessFuncInfo::print(raw_ostream &OS, const Module *M) const {
+  LoopInfo *LI = AM->getLoopInfo();
 
   ValueToValueMap NoSymbolicStrides;
 
   for (Loop *TopLevelLoop : *LI)
     for (Loop *L : depth_first(TopLevelLoop)) {
       OS.indent(2) << L->getHeader()->getName() << ":\n";
-      auto &LAI = LAA.getInfo(L, NoSymbolicStrides);
+      auto &LAI =
+          const_cast<LoopAccessFuncInfo *>(this)->getInfo(L, NoSymbolicStrides);
       LAI.print(OS, 4);
     }
 }
 
-bool LoopAccessAnalysis::runOnFunction(Function &F) {
-  SE = &getAnalysis<ScalarEvolutionWrapperPass>().getSE();
-  auto *TLIP = getAnalysisIfAvailable<TargetLibraryInfoWrapperPass>();
+class LoopAccessAMLegacy : public LoopAccessAMBase {
+public:
+  LoopAccessAMLegacy(LoopAccessAnalysis &LAA) {
+    SE = &LAA.getAnalysis<ScalarEvolutionWrapperPass>().getSE();
+    auto *TLIP = LAA.getAnalysisIfAvailable<TargetLibraryInfoWrapperPass>();
     TLI = TLIP ? &TLIP->getTLI() : nullptr;
-  AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
-  DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
-  LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
+    AA = &LAA.getAnalysis<AAResultsWrapperPass>().getAAResults();
+    DT = &LAA.getAnalysis<DominatorTreeWrapperPass>().getDomTree();
+    LI = &LAA.getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
+  }
+  TargetLibraryInfo *getTLI() override { return TLI; }
+  AliasAnalysis *getAAResults() override { return AA; }
+  DominatorTree *getDominatorTree() override { return DT; }
+  LoopInfo *getLoopInfo() override { return LI; }
+  ScalarEvolution *getSCEV() override { return SE; }
 
+private:
+  ScalarEvolution *SE;
+  TargetLibraryInfo *TLI;
+  AliasAnalysis *AA;
+  DominatorTree *DT;
+  LoopInfo *LI;
+};
+
+bool LoopAccessAnalysis::runOnFunction(Function &F) {
+  LAFI.setAM(new LoopAccessAMLegacy(*this));
   return false;
 }
 
 void LoopAccessAnalysis::getAnalysisUsage(AnalysisUsage &AU) const {
     AU.addRequired<ScalarEvolutionWrapperPass>();
     AU.addRequired<AAResultsWrapperPass>();
     AU.addRequired<DominatorTreeWrapperPass>();
     AU.addRequired<LoopInfoWrapperPass>();

lib/Transforms/Scalar/LoopDistribute.cpp

bool processLoop(LoopAccessAnalysis *LAA) {
 
     BasicBlock *PH = L->getLoopPreheader();
     if (!PH)
       return fail("no preheader");
     if (!L->getExitBlock())
       return fail("multiple exit blocks");
 
     // LAA will check that we only have a single exiting block.
-    LAI = &LAA->getInfo(L, ValueToValueMap());
+    LAI = &LAA->getInfo().getInfo(L, ValueToValueMap());
 
     // Currently, we only distribute to isolate the part of the loop with
     // dependence cycles to enable partial vectorization.
     if (LAI->canVectorizeMemory())
       return fail("memory operations are safe for vectorization");
 
     auto *Dependences = LAI->getDepChecker().getDependences();
     if (!Dependences || Dependences->empty())

lib/Transforms/Scalar/LoopIdiomRecognize.cpp

 // i64 and larger types when i64 is legal and the value has few bits set.  It
 // would be good to enhance isel to emit a loop for ctpop in this case.
 //
 // This could recognize common matrix multiplies and dot product idioms and
 // replace them with calls to BLAS (if linked in??).
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Scalar.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/BasicAliasAnalysis.h"
 #include "llvm/Analysis/GlobalsModRef.h"
-#include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/LoopAccessAnalysis.h"
+#include "llvm/Analysis/LoopAccessInfoAnalysis.h"
+#include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h"
 #include "llvm/Analysis/ScalarEvolutionExpander.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BuildLibCalls.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Transforms/Utils/LoopUtils.h"
 using namespace llvm;
 
 #define DEBUG_TYPE "loop-idiom"
 
 STATISTIC(NumMemSet, "Number of memset's formed from loop stores");

lib/Transforms/Scalar/LoopLoadElimination.cpp

for (Loop *TopLevelLoop : *LI)
       for (Loop *L : depth_first(TopLevelLoop))
         // We only handle inner-most loops.
         if (L->empty())
           Worklist.push_back(L);
 
     // Now walk the identified inner loops.
     bool Changed = false;
     for (Loop *L : Worklist) {
-      const LoopAccessInfo &LAI = LAA->getInfo(L, ValueToValueMap());
+      const LoopAccessInfo &LAI = LAA->getInfo().getInfo(L, ValueToValueMap());
       // The actual work is performed by LoadEliminationForLoop.
       LoadEliminationForLoop LEL(L, LI, LAI, DT);
       Changed |= LEL.processLoop();
     }
 
     // Process each loop nest in the function.
     return Changed;
   }

lib/Transforms/Scalar/LoopVersioningLICM.cpp

bool LoopVersioningLICM::legalLoopInstructions() {
   // instruction safety.
   for (auto *Block : CurLoop->getBlocks())
     for (auto &Inst : *Block) {
       // If instruction is unsafe just return false.
       if (!instructionSafeForVersioning(&Inst))
         return false;
     }
   // Get LoopAccessInfo from current loop.
-  LAI = &LAA->getInfo(CurLoop, Strides);
+  LAI = &LAA->getInfo().getInfo(CurLoop, Strides);
   // Check LoopAccessInfo for need of runtime check.
   if (LAI->getRuntimePointerChecking()->getChecks().empty()) {
     DEBUG(dbgs() << "    LAA: Runtime check not found !!\n");
     return false;
   }
   // Number of runtime-checks should be less then RuntimeMemoryCheckThreshold
   if (LAI->getNumRuntimePointerChecks() >
       VectorizerParams::RuntimeMemoryCheckThreshold) {

lib/Transforms/Utils/LoopVersioning.cpp

for (Loop *TopLevelLoop : *LI)
       for (Loop *L : depth_first(TopLevelLoop))
         // We only handle inner-most loops.
         if (L->empty())
           Worklist.push_back(L);
 
     // Now walk the identified inner loops.
     bool Changed = false;
     for (Loop *L : Worklist) {
-      const LoopAccessInfo &LAI = LAA->getInfo(L, ValueToValueMap());
+      const LoopAccessInfo &LAI = LAA->getInfo().getInfo(L, ValueToValueMap());
       if (LAI.getNumRuntimePointerChecks() ||
           !LAI.PSE.getUnionPredicate().isAlwaysTrue()) {
         LoopVersioning LVer(LAI, L, LI, DT, SE);
         LVer.versionLoop();
         LVer.annotateLoopWithNoAlias();
         Changed = true;
       }
     }

lib/Transforms/Vectorize/LoopVectorize.cpp

     Uniforms.insert(I);
 
     // Insert all operands.
     Worklist.insert(Worklist.end(), I->op_begin(), I->op_end());
   }
 }
 
 bool LoopVectorizationLegality::canVectorizeMemory() {
-  LAI = &LAA->getInfo(TheLoop, Strides);
+  LAI = &LAA->getInfo().getInfo(TheLoop, Strides);
   auto &OptionalReport = LAI->getReport();
   if (OptionalReport)
     emitAnalysis(VectorizationReport(*OptionalReport));
   if (!LAI->canVectorizeMemory())
     return false;
 
   if (LAI->hasStoreToLoopInvariantAddress()) {
     emitAnalysis(

lib/Transforms/Vectorize/SLPVectorizer.cpp

 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/AssumptionCache.h"
 #include "llvm/Analysis/CodeMetrics.h"
 #include "llvm/Analysis/DemandedBits.h"
 #include "llvm/Analysis/GlobalsModRef.h"
 #include "llvm/Analysis/LoopAccessAnalysis.h"
-#include "llvm/Analysis/LoopAccessAnalysis.h"
+#include "llvm/Analysis/LoopAccessInfoAnalysis.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/Analysis/VectorUtils.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Dominators.h"