[llvm] r229899 - [LoopAccesses] Change LAA:getInfo to return a constant reference
Adam Nemet
anemet at apple.com
Thu Feb 19 11:15:21 PST 2015
Author: anemet
Date: Thu Feb 19 13:15:21 2015
New Revision: 229899
URL: http://llvm.org/viewvc/llvm-project?rev=229899&view=rev
Log:
[LoopAccesses] Change LAA:getInfo to return a constant reference
As expected, this required a few more const-correctness fixes.
Based on Hal's feedback on D7684.
Modified:
llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h
llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp
llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp
Modified: llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h?rev=229899&r1=229898&r2=229899&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h (original)
+++ llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h Thu Feb 19 13:15:21 2015
@@ -155,9 +155,11 @@ public:
/// Return true we can analyze the memory accesses in the loop and there are
/// no memory dependence cycles.
- bool canVectorizeMemory() { return CanVecMem; }
+ bool canVectorizeMemory() const { return CanVecMem; }
- RuntimePointerCheck *getRuntimePointerCheck() { return &PtrRtCheck; }
+ const RuntimePointerCheck *getRuntimePointerCheck() const {
+ return &PtrRtCheck;
+ }
/// Return true if the block BB needs to be predicated in order for the loop
/// to be vectorized.
@@ -165,7 +167,7 @@ public:
DominatorTree *DT);
/// Returns true if the value V is uniform within the loop.
- bool isUniform(Value *V);
+ bool isUniform(Value *V) const;
unsigned getMaxSafeDepDistBytes() const { return MaxSafeDepDistBytes; }
unsigned getNumStores() const { return NumStores; }
@@ -176,11 +178,12 @@ public:
/// Returns a pair of instructions where the first element is the first
/// instruction generated in possibly a sequence of instructions and the
/// second value is the final comparator value or NULL if no check is needed.
- std::pair<Instruction *, Instruction *> addRuntimeCheck(Instruction *Loc);
+ std::pair<Instruction *, Instruction *>
+ addRuntimeCheck(Instruction *Loc) const;
/// \brief The diagnostics report generated for the analysis. E.g. why we
/// couldn't analyze the loop.
- Optional<LoopAccessReport> &getReport() { return Report; }
+ const Optional<LoopAccessReport> &getReport() const { return Report; }
/// \brief Print the information about the memory accesses in the loop.
void print(raw_ostream &OS, unsigned Depth = 0) const;
@@ -260,7 +263,7 @@ public:
/// of symbolic strides, \p Strides provides the mapping (see
/// replaceSymbolicStrideSCEV). If there is no cached result available run
/// the analysis.
- LoopAccessInfo &getInfo(Loop *L, ValueToValueMap &Strides);
+ const LoopAccessInfo &getInfo(Loop *L, ValueToValueMap &Strides);
void releaseMemory() override {
// Invalidate the cache when the pass is freed.
Modified: llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp?rev=229899&r1=229898&r2=229899&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp Thu Feb 19 13:15:21 2015
@@ -1198,7 +1198,7 @@ void LoopAccessInfo::emitAnalysis(LoopAc
Report = Message;
}
-bool LoopAccessInfo::isUniform(Value *V) {
+bool LoopAccessInfo::isUniform(Value *V) const {
return (SE->isLoopInvariant(SE->getSCEV(V), TheLoop));
}
@@ -1214,7 +1214,7 @@ static Instruction *getFirstInst(Instruc
}
std::pair<Instruction *, Instruction *>
-LoopAccessInfo::addRuntimeCheck(Instruction *Loc) {
+LoopAccessInfo::addRuntimeCheck(Instruction *Loc) const {
Instruction *tnullptr = nullptr;
if (!PtrRtCheck.Need)
return std::pair<Instruction *, Instruction *>(tnullptr, tnullptr);
@@ -1326,7 +1326,8 @@ void LoopAccessInfo::print(raw_ostream &
OS << "\n";
}
-LoopAccessInfo &LoopAccessAnalysis::getInfo(Loop *L, ValueToValueMap &Strides) {
+const LoopAccessInfo &LoopAccessAnalysis::getInfo(Loop *L,
+ ValueToValueMap &Strides) {
auto &LAI = LoopAccessInfoMap[L];
#ifndef NDEBUG
Modified: llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp?rev=229899&r1=229898&r2=229899&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp (original)
+++ llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp Thu Feb 19 13:15:21 2015
@@ -735,11 +735,11 @@ public:
bool isUniformAfterVectorization(Instruction* I) { return Uniforms.count(I); }
/// Returns the information that we collected about runtime memory check.
- LoopAccessInfo::RuntimePointerCheck *getRuntimePointerCheck() {
+ const LoopAccessInfo::RuntimePointerCheck *getRuntimePointerCheck() const {
return LAI->getRuntimePointerCheck();
}
- LoopAccessInfo *getLAI() {
+ const LoopAccessInfo *getLAI() const {
return LAI;
}
@@ -856,7 +856,7 @@ private:
LoopAccessAnalysis *LAA;
// And the loop-accesses info corresponding to this loop. This pointer is
// null until canVectorizeMemory sets it up.
- LoopAccessInfo *LAI;
+ const LoopAccessInfo *LAI;
// --- vectorization state --- //
More information about the llvm-commits
mailing list