shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[AMDGPU] Poison invalid globals after emitting error in LowerBufferFatPointers pass (#184662)

Browse Source 
After the change from `report_fatal_error` to `Ctx.emitError` in #142014
there is a necessity to remove unsupported globals. Otherwise there is a
secondary crash during ISel when processing them

Fixes SWDEV-511241
This commit is contained in:
Arseniy Obolenskiy 2026-03-10 15:35:27 +01:00 committed by GitHub
parent 97bffddf4f
commit 2133002b8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Target/AMDGPU/AMDGPULowerBufferFatPointers.cpp
View File

@ -2467,11 +2467,14 @@ bool AMDGPULowerBufferFatPointers::run(Module &M, const TargetMachine &TM) {
BufferFatPtrToStructTypeMap StructTM(DL);
BufferFatPtrToIntTypeMap IntTM(DL);
for (const GlobalVariable &GV : M.globals()) {
for (GlobalVariable &GV : make_early_inc_range(M.globals())) {
if (GV.getAddressSpace() == AMDGPUAS::BUFFER_FAT_POINTER) {
// FIXME: Use DiagnosticInfo unsupported but it requires a Function
Ctx.emitError("global variables with a buffer fat pointer address "
"space (7) are not supported");
GV.replaceAllUsesWith(PoisonValue::get(GV.getType()));
GV.eraseFromParent();
Changed = true;
continue;
}
@ -2481,6 +2484,9 @@ bool AMDGPULowerBufferFatPointers::run(Module &M, const TargetMachine &TM) {
Ctx.emitError("global variables that contain buffer fat pointers "
"(address space 7 pointers) are unsupported. Use "
"buffer resource pointers (address space 8) instead");
GV.replaceAllUsesWith(PoisonValue::get(GV.getType()));
GV.eraseFromParent();
Changed = true;
continue;
}
}

12
llvm/test/CodeGen/AMDGPU/buffer-fat-pointer-unsupported-errors.ll
View File

@ -3,6 +3,7 @@
; RUN: not opt -mtriple=amdgcn-amd-amdhsa -disable-output -passes=amdgpu-lower-buffer-fat-pointers %t/contains-poison-init.ll 2>&1 | FileCheck -check-prefix=ERR1 %s
; RUN: not opt -mtriple=amdgcn-amd-amdhsa -disable-output -passes=amdgpu-lower-buffer-fat-pointers %t/defined-gv-type.ll 2>&1 | FileCheck -check-prefix=ERR2 %s
; RUN: not opt -mtriple=amdgcn-amd-amdhsa -disable-output -passes=amdgpu-lower-buffer-fat-pointers %t/declared-gv-type.ll 2>&1 | FileCheck -check-prefix=ERR3 %s
; RUN: not opt -mtriple=amdgcn-amd-amdhsa -disable-output -passes=amdgpu-lower-buffer-fat-pointers %t/used-global-with-p7.ll 2>&1 | FileCheck -check-prefix=ERR4 %s
;--- contains-null-init.ll
; ERR0: error: global variables that contain buffer fat pointers (address space 7 pointers) are unsupported. Use buffer resource pointers (address space 8) instead
@ -20,3 +21,14 @@
; ERR3: error: global variables with a buffer fat pointer address space (7) are not supported
@extern_gv_is_addrspace_7 = external addrspace(7) global i32
;--- used-global-with-p7.ll
; ERR4: error: global variables that contain buffer fat pointers (address space 7 pointers) are unsupported. Use buffer resource pointers (address space 8) instead
; ERR4-NOT: LLVM ERROR
@G = global ptr addrspace(7) poison
define amdgpu_kernel void @use_global(ptr addrspace(7) %in) {
%ptr = load ptr addrspace(7), ptr @G, align 8
%v = load i32, ptr addrspace(7) %ptr, align 4
store i32 %v, ptr addrspace(7) %in, align 4
ret void
}