Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DAGCombiner] Fix ReplaceAllUsesOfValueWith mutation bug in visitFREEZE #104924

Merged
merged 3 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15808,13 +15808,16 @@ SDValue DAGCombiner::visitFREEZE(SDNode *N) {
}
}

SmallSetVector<SDValue, 8> MaybePoisonOperands;
for (SDValue Op : N0->ops()) {
SmallSet<SDValue, 8> MaybePoisonOperands;
SmallVector<unsigned, 8> MaybePoisonOperandNumbers;
for (auto [OpNo, Op] : enumerate(N0->ops())) {
if (DAG.isGuaranteedNotToBeUndefOrPoison(Op, /*PoisonOnly*/ false,
RKSimon marked this conversation as resolved.
Show resolved Hide resolved
/*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) {
Expand All @@ -15826,7 +15829,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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// 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
// 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;
Expand Down
31 changes: 31 additions & 0 deletions llvm/test/CodeGen/AArch64/dag-combine-freeze.ll
Original file line number Diff line number Diff line change
@@ -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
}
Loading