Skip to content

Commit d8a4c61

Browse files
authored
[CodeGenPrepare] Consider target memory intrinics as memory use (llvm#159638)
When deciding to sink address instructions into their uses, we check if it is profitable to do so. The profitability check is based on the types of uses of this address instruction -- if there are users which are not memory instructions, then do not fold. However, this profitability check wasn't considering target intrinsics, which may be loads / stores. This adds some logic to handle target memory intrinsics.
1 parent d38979d commit d8a4c61

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

llvm/lib/CodeGen/CodeGenPrepare.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5596,6 +5596,19 @@ static bool FindAllMemoryUses(
55965596
continue;
55975597
}
55985598

5599+
if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(UserI)) {
5600+
SmallVector<Value *, 2> PtrOps;
5601+
Type *AccessTy;
5602+
if (!TLI.getAddrModeArguments(II, PtrOps, AccessTy))
5603+
return true;
5604+
5605+
if (!find(PtrOps, U.get()))
5606+
return true;
5607+
5608+
MemoryUses.push_back({&U, AccessTy});
5609+
continue;
5610+
}
5611+
55995612
if (CallInst *CI = dyn_cast<CallInst>(UserI)) {
56005613
if (CI->hasFnAttr(Attribute::Cold)) {
56015614
// If this is a cold call, we can sink the addressing calculation into

llvm/test/CodeGen/AMDGPU/sink-addr-memory-intrinsics.ll

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,23 @@ define amdgpu_kernel void @memoryIntrinstic(ptr addrspace(3) %inptr, i1 %cond, p
66
; CHECK: ; %bb.0:
77
; CHECK-NEXT: s_load_dwordx4 s[0:3], s[4:5], 0x0
88
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
9-
; CHECK-NEXT: s_and_b32 s1, s1, 1
10-
; CHECK-NEXT: s_add_i32 s3, s0, 0x2000
11-
; CHECK-NEXT: s_cmp_eq_u32 s1, 0
9+
; CHECK-NEXT: s_bitcmp0_b32 s1, 0
1210
; CHECK-NEXT: s_cbranch_scc0 .LBB0_2
1311
; CHECK-NEXT: ; %bb.1: ; %else
14-
; CHECK-NEXT: v_mov_b32_e32 v0, s3
15-
; CHECK-NEXT: ds_read_b64_tr_b16 v[2:3], v0
16-
; CHECK-NEXT: s_mov_b32 s0, 0x7060302
17-
; CHECK-NEXT: s_mov_b32 s1, 0x5040100
12+
; CHECK-NEXT: v_mov_b32_e32 v0, s0
13+
; CHECK-NEXT: ds_read_b64_tr_b16 v[2:3], v0 offset:8192
14+
; CHECK-NEXT: s_mov_b32 s1, 0x7060302
15+
; CHECK-NEXT: s_mov_b32 s3, 0x5040100
1816
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
19-
; CHECK-NEXT: v_perm_b32 v0, v3, v2, s0
20-
; CHECK-NEXT: v_perm_b32 v1, v3, v2, s1
17+
; CHECK-NEXT: v_perm_b32 v0, v3, v2, s1
18+
; CHECK-NEXT: v_perm_b32 v1, v3, v2, s3
2119
; CHECK-NEXT: s_cbranch_execz .LBB0_3
2220
; CHECK-NEXT: s_branch .LBB0_4
2321
; CHECK-NEXT: .LBB0_2:
2422
; CHECK-NEXT: ; implicit-def: $vgpr1
2523
; CHECK-NEXT: .LBB0_3: ; %then
26-
; CHECK-NEXT: v_mov_b32_e32 v0, s3
27-
; CHECK-NEXT: ds_read_b64_tr_b16 v[2:3], v0
24+
; CHECK-NEXT: v_mov_b32_e32 v0, s0
25+
; CHECK-NEXT: ds_read_b64_tr_b16 v[2:3], v0 offset:8192
2826
; CHECK-NEXT: s_mov_b32 s0, 0x5040100
2927
; CHECK-NEXT: s_mov_b32 s1, 0x7060302
3028
; CHECK-NEXT: s_waitcnt lgkmcnt(0)

0 commit comments

Comments
 (0)