[llvm] [DAGCombiner] Fix ReplaceAllUsesOfValueWith mutation bug in visitFREEZE (PR #104924)
Björn Pettersson via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 21 08:27:20 PDT 2024
https://github.com/bjope updated https://github.com/llvm/llvm-project/pull/104924
>From 863ae12e26b2f7b49e31d4002a7cd91d7d250534 Mon Sep 17 00:00:00 2001
From: Bjorn Pettersson <bjorn.a.pettersson at ericsson.com>
Date: Tue, 20 Aug 2024 14:32:34 +0200
Subject: [PATCH 1/3] [DAGCombiner] Fix ReplaceAllUsesOfValueWith mutation bug
in visitFREEZE
In visitFREEZE we have been collecting a set/vector of
MaybePoisonOperands that later was iterated over, applying a freeze
to those operands. However, C-level fuzzy testing has discovered that
the recursiveness of ReplaceAllUsesOfValueWith may cause later
operands in the MaybePoisonOperands vector to be replaced when
replacing an earlier operand. That would then turn up as
Assertion `N1.getOpcode() != ISD::DELETED_NODE &&
"Operand is DELETED_NODE!"' failed.
failures when trying to freeze those later operands.
So we need to make sure that the vector with MaybePoisonOperands is
mutated as well when needed. Or as the solution used in this patch,
make sure to keep track of operand numbers that should be frozen
instead of having a vector of SDValues. And then we can refetch
the operands while iterating over operand numbers.
The problem was seen after adding SELECT_CC to the set of operations
including in "AllowMultipleMaybePoisonOperands". I'm not sure, but
I guess that this could happen for other operations as well for which
we allow multiple maybe poison operands.
---
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 23 +++++++++++---
.../CodeGen/AArch64/dag-combine-freeze.ll | 31 +++++++++++++++++++
2 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 llvm/test/CodeGen/AArch64/dag-combine-freeze.ll
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 80fdedcf9c6259..f399e2b2dd0e93 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -15808,13 +15808,17 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
}
}
- SmallSetVector<SDValue, 8> MaybePoisonOperands;
- for (SDValue Op : N0->ops()) {
+ SmallSet<SDValue, 8> MaybePoisonOperands;
+ SmallVector<unsigned, 8> MaybePoisonOperandNumbers;
+ for (unsigned OpNo = 0; OpNo < N0->getNumOperands(); ++OpNo) {
+ SDValue Op = N0->getOperand(OpNo);
if (DAG.isGuaranteedNotToBeUndefOrPoison(Op, /*PoisonOnly*/ false,
/*Depth*/ 1))
continue;
bool HadMaybePoisonOperands = !MaybePoisonOperands.empty();
- bool IsNewMaybePoisonOperand = MaybePoisonOperands.insert(Op);
+ bool IsNewMaybePoisonOperand = MaybePoisonOperands.insert(Op).second;
+ if (IsNewMaybePoisonOperand)
+ MaybePoisonOperandNumbers.push_back(OpNo);
if (!HadMaybePoisonOperands)
continue;
if (IsNewMaybePoisonOperand && !AllowMultipleMaybePoisonOperands) {
@@ -15826,7 +15830,18 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
// it could create undef or poison due to it's poison-generating flags.
// So not finding any maybe-poison operands is fine.
- for (SDValue MaybePoisonOperand : MaybePoisonOperands) {
+ for (unsigned OpNo : MaybePoisonOperandNumbers) {
+ // N0 can mutate during iteration, so make sure to refech the maybe poison
+ // operands via the operand numbers. The typical scenario is that we have
+ // something like this
+ // t262: i32 = freeze t181
+ // t150: i32 = ctlz_zero_undef t262
+ // t184: i32 = ctlz_zero_undef t181
+ // t268: i32 = select_cc t181, Constant:i32<0>, t184, t186, setne:ch
+ // When freezing the t181 operand we get t262 back, and then the
+ // ReplaceAllUsesOfValueWith call will not only replace t181 by t262, but
+ // also recursively replace t184 by t150.
+ SDValue MaybePoisonOperand = N->getOperand(0).getOperand(OpNo);
// Don't replace every single UNDEF everywhere with frozen UNDEF, though.
if (MaybePoisonOperand.getOpcode() == ISD::UNDEF)
continue;
diff --git a/llvm/test/CodeGen/AArch64/dag-combine-freeze.ll b/llvm/test/CodeGen/AArch64/dag-combine-freeze.ll
new file mode 100644
index 00000000000000..4f0c3d0ce18006
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/dag-combine-freeze.ll
@@ -0,0 +1,31 @@
+; RUN: llc -mtriple aarch64 -o /dev/null %s
+
+; This used to fail with:
+; Assertion `N1.getOpcode() != ISD::DELETED_NODE &&
+; "Operand is DELETED_NODE!"' failed.
+; Just make sure we do not crash here.
+define void @test_fold_freeze_over_select_cc(i15 %a, ptr %p1, ptr %p2) {
+entry:
+ %a2 = add nsw i15 %a, 1
+ %sext = sext i15 %a2 to i32
+ %ashr = ashr i32 %sext, 31
+ %lshr = lshr i32 %ashr, 7
+ ; Setup an already frozen input to ctlz.
+ %freeze = freeze i32 %lshr
+ %ctlz = call i32 @llvm.ctlz.i32(i32 %freeze, i1 true)
+ store i32 %ctlz, ptr %p1, align 1
+ ; Here is another ctlz, which is used by a frozen select.
+ ; DAGCombiner::visitFREEZE will to try to fold the freeze over a SELECT_CC,
+ ; and when dealing with the condition operand the other SELECT_CC operands
+ ; will be replaced/simplified as well. So the SELECT_CC is mutated while
+ ; freezing the "maybe poison operands". This needs to be handled by
+ ; DAGCombiner::visitFREEZE, as it can't store the list of SDValues that
+ ; should be frozen in a separate data structure that isn't updated when the
+ ; SELECT_CC is mutated.
+ %ctlz1 = call i32 @llvm.ctlz.i32(i32 %lshr, i1 true)
+ %icmp = icmp ne i32 %lshr, 0
+ %select = select i1 %icmp, i32 %ctlz1, i32 0
+ %freeze1 = freeze i32 %select
+ store i32 %freeze1, ptr %p2, align 1
+ ret void
+}
>From 9180ed8128b6544fcb042378ee6deb855bf29fb8 Mon Sep 17 00:00:00 2001
From: Bjorn Pettersson <bjorn.a.pettersson at ericsson.com>
Date: Tue, 20 Aug 2024 15:30:15 +0200
Subject: [PATCH 2/3] fixup: use enumerate and structured bindings
---
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index f399e2b2dd0e93..b7d1ddac0592b6 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -15810,8 +15810,7 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
SmallSet<SDValue, 8> MaybePoisonOperands;
SmallVector<unsigned, 8> MaybePoisonOperandNumbers;
- for (unsigned OpNo = 0; OpNo < N0->getNumOperands(); ++OpNo) {
- SDValue Op = N0->getOperand(OpNo);
+ for (auto [OpNo, Op] : enumerate(N0->ops())) {
if (DAG.isGuaranteedNotToBeUndefOrPoison(Op, /*PoisonOnly*/ false,
/*Depth*/ 1))
continue;
>From 7ade17a9c26ae7f17fce818f031d6808e8c7c4ed Mon Sep 17 00:00:00 2001
From: Bjorn Pettersson <bjorn.a.pettersson at ericsson.com>
Date: Wed, 21 Aug 2024 17:26:28 +0200
Subject: [PATCH 3/3] fixup: fix typo in code comment
---
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index b7d1ddac0592b6..fa26e8ab1a555c 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -15830,7 +15830,7 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
// So not finding any maybe-poison operands is fine.
for (unsigned OpNo : MaybePoisonOperandNumbers) {
- // N0 can mutate during iteration, so make sure to refech the maybe poison
+ // N0 can mutate during iteration, so make sure to refetch the maybe poison
// operands via the operand numbers. The typical scenario is that we have
// something like this
// t262: i32 = freeze t181
More information about the llvm-commits
mailing list