[llvm] r229634 - [LoopAccesses] Change LAA:getInfo to return a constant reference
Zachary Turner
zturner at google.com
Tue Feb 17 21:23:19 PST 2015
Ok, thanks!
On Tue Feb 17 2015 at 9:22:49 PM Adam Nemet <anemet at apple.com> wrote:
> Got a conflict trying to commit this. Comnerd fixed it in 229638.
>
> On Feb 17, 2015, at 8:59 PM, Adam Nemet <anemet at apple.com> wrote:
>
> Looks like I need to qualify make_unique with llvm::
>
> On Feb 17, 2015, at 8:54 PM, Adam Nemet <anemet at apple.com> wrote:
>
> Sure. The first failure looked like a glitch so I forced a new build.
> Now there is actually error in the new build, I’m taking a look.
>
> On Feb 17, 2015, at 8:32 PM, Zachary Turner <zturner at google.com> wrote:
>
> Hi adam, one of these changes has broken the lldb bot, can you ptal?
>
> http://lab.llvm.org:8011/builders/lldb-x86-windows-msvc
> On Tue, Feb 17, 2015 at 8:05 PM Adam Nemet <anemet at apple.com> wrote:
>
>> Author: anemet
>> Date: Tue Feb 17 21:44:33 2015
>> New Revision: 229634
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=229634&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=229634&r1=229633&r2=229634&
>> view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h (original)
>> +++ llvm/trunk/include/llvm/Analysis/LoopAccessAnalysis.h Tue Feb 17
>> 21:44:33 2015
>> @@ -153,9 +153,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.
>> @@ -163,7 +165,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; }
>> @@ -174,11 +176,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;
>> @@ -258,7 +261,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=229634&r1=229633&r2=229634&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp (original)
>> +++ llvm/trunk/lib/Analysis/LoopAccessAnalysis.cpp Tue Feb 17 21:44:33
>> 2015
>> @@ -1173,7 +1173,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));
>> }
>>
>> @@ -1189,7 +1189,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);
>> @@ -1301,7 +1301,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=229634&
>> r1=229633&r2=229634&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp (original)
>> +++ llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp Tue Feb 17
>> 21:44:33 2015
>> @@ -756,11 +756,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;
>> }
>>
>> @@ -877,7 +877,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 --- //
>>
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150218/ad58394e/attachment.html>
More information about the llvm-commits
mailing list