Skip to content

Commit 3addda0

Browse files
jayfoadAlexisPerry
authored andcommitted
[AMDGPU] Preserve chain when selecting llvm.amdgcn.pops.exiting.wave.id (llvm#96167)
Without this SelectionDAG could fail assertions when using the intrinsic in a non-entry BB.
1 parent 640c776 commit 3addda0

File tree

2 files changed

+41
-1
lines changed

2 files changed

+41
-1
lines changed

llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2554,7 +2554,8 @@ void AMDGPUDAGToDAGISel::SelectPOPSExitingWaveID(SDNode *N) {
25542554
// intrinsic is IntrReadMem/IntrWriteMem but the instruction is not marked
25552555
// mayLoad/mayStore and tablegen complains about the mismatch.
25562556
SDValue Reg = CurDAG->getRegister(AMDGPU::SRC_POPS_EXITING_WAVE_ID, MVT::i32);
2557-
CurDAG->SelectNodeTo(N, AMDGPU::S_MOV_B32, N->getVTList(), Reg);
2557+
SDValue Chain = N->getOperand(0);
2558+
CurDAG->SelectNodeTo(N, AMDGPU::S_MOV_B32, N->getVTList(), {Reg, Chain});
25582559
}
25592560

25602561
static unsigned gwsIntrinToOpcode(unsigned IntrID) {

llvm/test/CodeGen/AMDGPU/llvm.amdgcn.pops.exiting.wave.id.ll

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,42 @@ define amdgpu_ps void @test(ptr addrspace(1) inreg %ptr) {
3232
store i32 %id, ptr addrspace(1) %ptr
3333
ret void
3434
}
35+
36+
define amdgpu_ps void @test_loop() {
37+
; SDAG-LABEL: test_loop:
38+
; SDAG: ; %bb.0:
39+
; SDAG-NEXT: s_mov_b32 s0, src_pops_exiting_wave_id
40+
; SDAG-NEXT: .LBB1_1: ; %loop
41+
; SDAG-NEXT: ; =>This Inner Loop Header: Depth=1
42+
; SDAG-NEXT: s_cmp_eq_u32 s0, 0
43+
; SDAG-NEXT: s_cbranch_scc1 .LBB1_1
44+
; SDAG-NEXT: ; %bb.2: ; %exit
45+
; SDAG-NEXT: s_endpgm
46+
;
47+
; GFX9-GISEL-LABEL: test_loop:
48+
; GFX9-GISEL: ; %bb.0:
49+
; GFX9-GISEL-NEXT: s_mov_b32 s0, src_pops_exiting_wave_id
50+
; GFX9-GISEL-NEXT: .LBB1_1: ; %loop
51+
; GFX9-GISEL-NEXT: ; =>This Inner Loop Header: Depth=1
52+
; GFX9-GISEL-NEXT: s_cmp_eq_u32 s0, 0
53+
; GFX9-GISEL-NEXT: s_cbranch_scc1 .LBB1_1
54+
; GFX9-GISEL-NEXT: ; %bb.2: ; %exit
55+
; GFX9-GISEL-NEXT: s_endpgm
56+
;
57+
; GFX10-GISEL-LABEL: test_loop:
58+
; GFX10-GISEL: ; %bb.0:
59+
; GFX10-GISEL-NEXT: s_mov_b32 s0, src_pops_exiting_wave_id
60+
; GFX10-GISEL-NEXT: .LBB1_1: ; %loop
61+
; GFX10-GISEL-NEXT: ; =>This Inner Loop Header: Depth=1
62+
; GFX10-GISEL-NEXT: s_cmp_eq_u32 s0, 0
63+
; GFX10-GISEL-NEXT: s_cbranch_scc1 .LBB1_1
64+
; GFX10-GISEL-NEXT: ; %bb.2: ; %exit
65+
; GFX10-GISEL-NEXT: s_endpgm
66+
br label %loop
67+
loop:
68+
%id = call i32 @llvm.amdgcn.pops.exiting.wave.id()
69+
%cond = icmp eq i32 %id, 0
70+
br i1 %cond, label %loop, label %exit
71+
exit:
72+
ret void
73+
}

0 commit comments

Comments
 (0)