[llvm] [SCEV] Collect and merge loop guards through PHI nodes with multiple incoming values (PR #113915)
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 17 11:33:10 PST 2024
================
@@ -15217,7 +15221,81 @@ bool ScalarEvolution::matchURem(const SCEV *Expr, const SCEV *&LHS,
ScalarEvolution::LoopGuards
ScalarEvolution::LoopGuards::collect(const Loop *L, ScalarEvolution &SE) {
+ BasicBlock *Header = L->getHeader();
+ BasicBlock *Pred = L->getLoopPredecessor();
LoopGuards Guards(SE);
+ SmallPtrSet<const BasicBlock *, 8> VisitedBlocks;
+ collectFromBlock(SE, Guards, Header, Pred, VisitedBlocks);
+ return Guards;
+}
+
+void ScalarEvolution::LoopGuards::collectFromPHI(
+ ScalarEvolution &SE, ScalarEvolution::LoopGuards &Guards,
+ const PHINode &Phi, SmallPtrSetImpl<const BasicBlock *> &VisitedBlocks,
+ SmallDenseMap<const BasicBlock *, LoopGuards> &IncomingGuards,
+ unsigned Depth) {
+ if (!SE.isSCEVable(Phi.getType()))
+ return;
+
+ using MinMaxPattern = std::pair<const SCEVConstant *, SCEVTypes>;
+ auto GetMinMaxConst = [&](unsigned IncomingIdx) -> MinMaxPattern {
+ const BasicBlock *InBlock = Phi.getIncomingBlock(IncomingIdx);
+ if (!VisitedBlocks.insert(InBlock).second)
+ return {nullptr, scCouldNotCompute};
+ auto [G, Inserted] = IncomingGuards.try_emplace(InBlock, LoopGuards(SE));
+ if (Inserted)
+ collectFromBlock(SE, G->second, Phi.getParent(), InBlock, VisitedBlocks,
+ Depth + 1);
+ auto S = G->second.RewriteMap.find(
----------------
fhahn wrote:
Should be fixed in feb9b3701bf6650f91e12e7f4efbe72383f3f60b (@juliannagele is OOO for few days, so I took care of it)
https://github.com/llvm/llvm-project/pull/113915
More information about the llvm-commits
mailing list