Skip to content

Commit 1fd1f63

Browse files
committed
[amdgpu] Fix a crash case when V_CNDMASK could be simplified.
- Once an instruction is simplified, foldable candidates from it should be invalidated or skipped as the operand index is no longer valid. Differential Revision: https://reviews.llvm.org/D93174
1 parent cae2d87 commit 1fd1f63

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

llvm/lib/Target/AMDGPU/SIFoldOperands.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,8 +1257,11 @@ void SIFoldOperands::foldInstOperand(MachineInstr &MI,
12571257
for (MachineInstr *Copy : CopiesToReplace)
12581258
Copy->addImplicitDefUseOperands(*MF);
12591259

1260+
SmallPtrSet<MachineInstr *, 16> Folded;
12601261
for (FoldCandidate &Fold : FoldList) {
12611262
assert(!Fold.isReg() || Fold.OpToFold);
1263+
if (Folded.count(Fold.UseMI))
1264+
continue;
12621265
if (Fold.isReg() && Fold.OpToFold->getReg().isVirtual()) {
12631266
Register Reg = Fold.OpToFold->getReg();
12641267
MachineInstr *DefMI = Fold.OpToFold->getParent();
@@ -1278,7 +1281,8 @@ void SIFoldOperands::foldInstOperand(MachineInstr &MI,
12781281
LLVM_DEBUG(dbgs() << "Folded source from " << MI << " into OpNo "
12791282
<< static_cast<int>(Fold.UseOpNo) << " of "
12801283
<< *Fold.UseMI << '\n');
1281-
tryFoldInst(TII, Fold.UseMI);
1284+
if (tryFoldInst(TII, Fold.UseMI))
1285+
Folded.insert(Fold.UseMI);
12821286
} else if (Fold.isCommuted()) {
12831287
// Restoring instruction's original operand order if fold has failed.
12841288
TII->commuteInstruction(*Fold.UseMI, false);
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2+
# RUN: llc -march=amdgcn -mcpu=gfx1030 -run-pass si-fold-operands -verify-machineinstrs -o - %s | FileCheck %s
3+
4+
---
5+
name: fold_cndmask
6+
tracksRegLiveness: true
7+
registers:
8+
body: |
9+
bb.0.entry:
10+
; CHECK-LABEL: name: fold_cndmask
11+
; CHECK: [[DEF:%[0-9]+]]:sreg_32_xm0_xexec = IMPLICIT_DEF
12+
; CHECK: [[S_MOV_B32_:%[0-9]+]]:sreg_32 = S_MOV_B32 0
13+
; CHECK: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
14+
; CHECK: [[COPY:%[0-9]+]]:vgpr_32 = COPY [[S_MOV_B32_]]
15+
%0:sreg_32_xm0_xexec = IMPLICIT_DEF
16+
%1:sreg_32 = S_MOV_B32 0
17+
%2:vgpr_32 = COPY %1:sreg_32
18+
%3:vgpr_32 = V_CNDMASK_B32_e64 0, %1:sreg_32, 0, %2:vgpr_32, %0:sreg_32_xm0_xexec, implicit $exec
19+
20+
...

0 commit comments

Comments
 (0)