From 6300c37a461bf245c58bf2a6a24b618282c0a92b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 19 May 2021 00:00:17 +0200 Subject: [PATCH] [SCEV] Cache operands used in BEInfo (NFC) When memoized values for a SCEV expressions are dropped, we also drop all BECounts that make use of the SCEV expression. This is done by iterating over all the ExitNotTaken counts and (recursively) checking whether they use the SCEV expression. If there are many exits, this will take a lot of time. This patch improves the situation by pre-computing a set of all used operands, so that we can determine whether a certain BEInfo needs to be invalidated using a simple set lookup. Will still need to loop over all BEInfos though. This makes for a mild improvement on non-degenerate cases: https://llvm-compile-time-tracker.com/compare.php?from=b661a55a253f4a1cf5a0fbcb86e5ba7b9fb1387b&to=be1393f450e594c53f0ad7e62339a6bc831b16f6&stat=instructions For the degenerate case from https://bugs.llvm.org/show_bug.cgi?id=50384, for n=128 I'm seeing run time drop from 1.6s to 1.1s. Differential Revision: https://reviews.llvm.org/D102796 --- llvm/include/llvm/Analysis/ScalarEvolution.h | 5 +++- llvm/lib/Analysis/ScalarEvolution.cpp | 37 ++++++++++++++++++---------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/llvm/include/llvm/Analysis/ScalarEvolution.h b/llvm/include/llvm/Analysis/ScalarEvolution.h index 547183d..b423b01 100644 --- a/llvm/include/llvm/Analysis/ScalarEvolution.h +++ b/llvm/include/llvm/Analysis/ScalarEvolution.h @@ -1390,6 +1390,9 @@ private: /// True iff the backedge is taken either exactly Max or zero times. bool MaxOrZero = false; + /// SCEV expressions used in any of the ExitNotTakenInfo counts. + SmallPtrSet Operands; + bool isComplete() const { return IsComplete; } const SCEV *getConstantMax() const { return ConstantMax; } @@ -1458,7 +1461,7 @@ private: /// Return true if any backedge taken count expressions refer to the given /// subexpression. - bool hasOperand(const SCEV *S, ScalarEvolution *SE) const; + bool hasOperand(const SCEV *S) const; }; /// Cache the backedge-taken count of the loops for this function as they diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp index 1687929..a38ea84 100644 --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/lib/Analysis/ScalarEvolution.cpp @@ -7392,18 +7392,8 @@ bool ScalarEvolution::BackedgeTakenInfo::isConstantMaxOrZero( return MaxOrZero && !any_of(ExitNotTaken, PredicateNotAlwaysTrue); } -bool ScalarEvolution::BackedgeTakenInfo::hasOperand(const SCEV *S, - ScalarEvolution *SE) const { - if (getConstantMax() && getConstantMax() != SE->getCouldNotCompute() && - SE->hasOperand(getConstantMax(), S)) - return true; - - for (auto &ENT : ExitNotTaken) - if (ENT.ExactNotTaken != SE->getCouldNotCompute() && - SE->hasOperand(ENT.ExactNotTaken, S)) - return true; - - return false; +bool ScalarEvolution::BackedgeTakenInfo::hasOperand(const SCEV *S) const { + return Operands.contains(S); } ScalarEvolution::ExitLimit::ExitLimit(const SCEV *E) @@ -7445,6 +7435,19 @@ ScalarEvolution::ExitLimit::ExitLimit(const SCEV *E, const SCEV *M, "No point in having a non-constant max backedge taken count!"); } +class SCEVRecordOperands { + SmallPtrSetImpl &Operands; + +public: + SCEVRecordOperands(SmallPtrSetImpl &Operands) + : Operands(Operands) {} + bool follow(const SCEV *S) { + Operands.insert(S); + return true; + } + bool isDone() { return false; } +}; + /// Allocate memory for BackedgeTakenInfo and copy the not-taken count of each /// computable exit into a persistent ExitNotTakenInfo array. ScalarEvolution::BackedgeTakenInfo::BackedgeTakenInfo( @@ -7473,6 +7476,14 @@ ScalarEvolution::BackedgeTakenInfo::BackedgeTakenInfo( assert((isa(ConstantMax) || isa(ConstantMax)) && "No point in having a non-constant max backedge taken count!"); + + SCEVRecordOperands RecordOperands(Operands); + SCEVTraversal ST(RecordOperands); + if (!isa(ConstantMax)) + ST.visitAll(ConstantMax); + for (auto &ENT : ExitNotTaken) + if (!isa(ENT.ExactNotTaken)) + ST.visitAll(ENT.ExactNotTaken); } /// Compute the number of times the backedge of the specified loop will execute. @@ -12627,7 +12638,7 @@ ScalarEvolution::forgetMemoizedResults(const SCEV *S) { [S, this](DenseMap &Map) { for (auto I = Map.begin(), E = Map.end(); I != E;) { BackedgeTakenInfo &BEInfo = I->second; - if (BEInfo.hasOperand(S, this)) + if (BEInfo.hasOperand(S)) Map.erase(I++); else ++I; -- 2.7.4