[llvm] Ensure `collectTransitivePredecessors` returns Pred only from the Loop. (PR #113831)
Manish Kausik H via llvm-commits
llvm-commits at lists.llvm.org
Sun Oct 27 12:05:00 PDT 2024
https://github.com/Nirhar created https://github.com/llvm/llvm-project/pull/113831
It's possible that we encounter Irreducible control flow, due to which, we may find that a few predecessors of BB are not a part of the CurLoop. Currently we crash in the function for such cases. This patch ensures that we only return Predecessors that are a part of CurLoop and gracefully ignore other Predecessors.
For example, consider Irreducible IR of this form:
```
source_filename = "reduced.ll"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128-ni:1-p2:32:8:8:32-ni:2"
target triple = "x86_64-unknown-linux-gnu"
declare ptr addrspace(1) @widget(ptr addrspace(1), ptr addrspace(1))
define i64 @baz() {
bb:
br label %bb1
bb1: ; preds = %bb3, %bb
br label %bb3
bb2: ; No predecessors!
br label %bb3
bb3: ; preds = %bb2, %bb1
%load = load ptr addrspace(1), ptr addrspace(1) null, align 8
%call = call ptr addrspace(1) @widget(ptr addrspace(1) %load, ptr addrspace(1) null)
br label %bb1
}
```
This crashes when `collectTransitivePredecessors` is called on the `%bb1<Header>, %bb3<latch>` loop, because the loop body has a predecessor `%bb2` which is not a part of the loop.
>From 6f91d0fd86d3528121796df950642bdb8f33ca56 Mon Sep 17 00:00:00 2001
From: Manish Kausik H <hmanishkausik at gmail.com>
Date: Mon, 28 Oct 2024 00:24:55 +0530
Subject: [PATCH] Ensure `collectTransitivePredecessors` returns Pred only from
the Loop.
It's possible that we encounter Irreducible control flow, due to
which, we may find that a few predecessors of BB are not a part of the
CurLoop. Currently we crash in the function for such cases. This patch
ensures that we only return Predecessors that are a part of CurLoop and
gracefully ignore other Predecessors.
---
llvm/lib/Analysis/MustExecute.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/llvm/lib/Analysis/MustExecute.cpp b/llvm/lib/Analysis/MustExecute.cpp
index caed62679a683c..8e233a5c8d7a54 100644
--- a/llvm/lib/Analysis/MustExecute.cpp
+++ b/llvm/lib/Analysis/MustExecute.cpp
@@ -162,6 +162,9 @@ static bool CanProveNotTakenFirstIteration(const BasicBlock *ExitBlock,
/// Collect all blocks from \p CurLoop which lie on all possible paths from
/// the header of \p CurLoop (inclusive) to BB (exclusive) into the set
/// \p Predecessors. If \p BB is the header, \p Predecessors will be empty.
+/// Note: It's possible that we encounter Irreducible control flow, due to
+/// which, we may find that a few predecessors of \p BB are not a part of the
+/// \p CurLoop. We only return Predecessors that are a part of \p CurLoop.
static void collectTransitivePredecessors(
const Loop *CurLoop, const BasicBlock *BB,
SmallPtrSetImpl<const BasicBlock *> &Predecessors) {
@@ -171,6 +174,8 @@ static void collectTransitivePredecessors(
return;
SmallVector<const BasicBlock *, 4> WorkList;
for (const auto *Pred : predecessors(BB)) {
+ if (!CurLoop->contains(Pred))
+ continue;
Predecessors.insert(Pred);
WorkList.push_back(Pred);
}
@@ -187,7 +192,7 @@ static void collectTransitivePredecessors(
// We can ignore backedge of all loops containing BB to get a sligtly more
// optimistic result.
for (const auto *PredPred : predecessors(Pred))
- if (Predecessors.insert(PredPred).second)
+ if (CurLoop->contains(PredPred) && Predecessors.insert(PredPred).second)
WorkList.push_back(PredPred);
}
}
More information about the llvm-commits
mailing list