Skip to content

Commit 9c9013f

Browse files
isakhilesharsenm
andauthored
[AMDGPU] Handle MachineOperandType global address in SIFoldOperands. (llvm#135424)
This patch handles the global operand type properly, fixing the bug : Assertion `(isFI() || isCPI() || isTargetIndex() || isJTI()) && "Wrong MachineOperand accessor"` failed. Fixes SWDEV-504645 --------- Co-authored-by: Matt Arsenault <[email protected]>
1 parent 640103b commit 9c9013f

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

llvm/lib/Target/AMDGPU/SIFoldOperands.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,14 @@ void SIFoldOperandsImpl::foldOperand(
11711171

11721172
if (OpToFold.isImm())
11731173
UseMI->getOperand(1).ChangeToImmediate(OpToFold.getImm());
1174-
else
1174+
else if (OpToFold.isFI())
11751175
UseMI->getOperand(1).ChangeToFrameIndex(OpToFold.getIndex());
1176+
else {
1177+
assert(OpToFold.isGlobal());
1178+
UseMI->getOperand(1).ChangeToGA(OpToFold.getGlobal(),
1179+
OpToFold.getOffset(),
1180+
OpToFold.getTargetFlags());
1181+
}
11761182
UseMI->removeOperand(2); // Remove exec read (or src1 for readlane)
11771183
return;
11781184
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
2+
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 < %s | FileCheck %s
3+
4+
define void @test_load_zext() {
5+
; CHECK-LABEL: test_load_zext:
6+
; CHECK: ; %bb.0: ; %.entry
7+
; CHECK-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
8+
; CHECK-NEXT: s_mov_b32 s0, s33
9+
; CHECK-NEXT: s_mov_b32 s33, s32
10+
; CHECK-NEXT: s_or_saveexec_b64 s[2:3], -1
11+
; CHECK-NEXT: scratch_store_dword off, v40, s33 ; 4-byte Folded Spill
12+
; CHECK-NEXT: s_mov_b64 exec, s[2:3]
13+
; CHECK-NEXT: s_add_i32 s32, s32, 16
14+
; CHECK-NEXT: v_writelane_b32 v40, s0, 2
15+
; CHECK-NEXT: s_getpc_b64 s[0:1]
16+
; CHECK-NEXT: s_add_u32 s0, s0, has_spgr_args@gotpcrel32@lo+4
17+
; CHECK-NEXT: s_addc_u32 s1, s1, has_spgr_args@gotpcrel32@hi+12
18+
; CHECK-NEXT: s_load_dwordx2 s[2:3], s[0:1], 0x0
19+
; CHECK-NEXT: v_writelane_b32 v40, s30, 0
20+
; CHECK-NEXT: s_mov_b32 s0, DescriptorBuffer@abs32@lo
21+
; CHECK-NEXT: v_writelane_b32 v40, s31, 1
22+
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
23+
; CHECK-NEXT: s_swappc_b64 s[30:31], s[2:3]
24+
; CHECK-NEXT: v_readlane_b32 s31, v40, 1
25+
; CHECK-NEXT: v_readlane_b32 s30, v40, 0
26+
; CHECK-NEXT: s_mov_b32 s32, s33
27+
; CHECK-NEXT: v_readlane_b32 s0, v40, 2
28+
; CHECK-NEXT: s_or_saveexec_b64 s[2:3], -1
29+
; CHECK-NEXT: scratch_load_dword v40, off, s33 ; 4-byte Folded Reload
30+
; CHECK-NEXT: s_mov_b64 exec, s[2:3]
31+
; CHECK-NEXT: s_mov_b32 s33, s0
32+
; CHECK-NEXT: s_waitcnt vmcnt(0)
33+
; CHECK-NEXT: s_setpc_b64 s[30:31]
34+
.entry:
35+
%reloc = call i32 @llvm.amdgcn.reloc.constant(metadata !0)
36+
call void @has_spgr_args(i32 %reloc)
37+
ret void
38+
}
39+
40+
declare void @has_spgr_args(i32 inreg)
41+
42+
declare i32 @llvm.amdgcn.reloc.constant(metadata) #0
43+
44+
!0 = !{!"DescriptorBuffer", i32 4, i32 8, i32 0, i32 0}

0 commit comments

Comments
 (0)