Skip to content

[AMDGPU][LowerBufferFatPointers] Fix lack of rewrite when loading/storing null #154128

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.

Sign up for GitHub

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

Merged
krzysz00 merged 5 commits into from
Aug 18, 2025
Merged

[AMDGPU][LowerBufferFatPointers] Fix lack of rewrite when loading/storing null #154128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1db6b8
[AMDGPU][LowerBufferFatPointers] Fix lack of rewrite when loading/sto…
krzysz00 Aug 18, 2025
45a4f27
Whoops, forgot the tests
krzysz00 Aug 18, 2025
90473a8
Fix typo
krzysz00 Aug 18, 2025
806e014
Poison test
krzysz00 Aug 18, 2025
b8f66fe
Merge branch 'store-to-null-crashes' of github.com:krzysz00/llvm-proj…
krzysz00 Aug 18, 2025
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
6 changes: 5 additions & 1 deletion llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,8 +2366,12 @@ static bool containsBufferFatPointers(const Function &F,
BufferFatPtrToStructTypeMap *TypeMap) {
bool HasFatPointers = false;
for (const BasicBlock &BB : F)
for (const Instruction &I : BB)
for (const Instruction &I : BB) {
HasFatPointers |= (I.getType() != TypeMap->remapType(I.getType()));
// Catch null pointer constants in loads, stores, etc.
for (const Value *V : I.operand_values())
HasFatPointers |= (V->getType() != TypeMap->remapType(V->getType()));
}
return HasFatPointers;
}

Expand Down
40 changes: 40 additions & 0 deletions llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-constants.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,43 @@ define i32 @fancy_zero() {
ptr addrspace(7) addrspacecast (ptr addrspace(8) @buf to ptr addrspace(7))
to i32)
}

define i32 @load_null() {
; CHECK-LABEL: define i32 @load_null
; CHECK-SAME: () #[[ATTR0]] {
; CHECK-NEXT: [[X:%.*]] = call i32 @llvm.amdgcn.raw.ptr.buffer.load.i32(ptr addrspace(8) align 4 null, i32 0, i32 0, i32 0)
; CHECK-NEXT: ret i32 [[X]]
;
%x = load i32, ptr addrspace(7) null, align 4
ret i32 %x
}

define void @store_null() {
; CHECK-LABEL: define void @store_null
; CHECK-SAME: () #[[ATTR0]] {
; CHECK-NEXT: call void @llvm.amdgcn.raw.ptr.buffer.store.i32(i32 0, ptr addrspace(8) align 4 null, i32 0, i32 0, i32 0)
; CHECK-NEXT: ret void
;
store i32 0, ptr addrspace(7) null, align 4
ret void
}
Copy link
Contributor

@arsenm arsenm Aug 18, 2025

Choose a reason for hiding this comment

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

Can you also test the poison case


define i32 @load_poison() {
; CHECK-LABEL: define i32 @load_poison
; CHECK-SAME: () #[[ATTR0]] {
; CHECK-NEXT: [[X:%.*]] = call i32 @llvm.amdgcn.raw.ptr.buffer.load.i32(ptr addrspace(8) align 4 poison, i32 poison, i32 0, i32 0)
; CHECK-NEXT: ret i32 [[X]]
;
%x = load i32, ptr addrspace(7) poison, align 4
ret i32 %x
}

define void @store_poison() {
; CHECK-LABEL: define void @store_poison
; CHECK-SAME: () #[[ATTR0]] {
; CHECK-NEXT: call void @llvm.amdgcn.raw.ptr.buffer.store.i32(i32 0, ptr addrspace(8) align 4 poison, i32 poison, i32 0, i32 0)
; CHECK-NEXT: ret void
;
store i32 0, ptr addrspace(7) poison, align 4
ret void
}