fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/llvm: fix get_global_address for global atomics
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
They do not have an ACCESS index.

Fixes: 9a33c03654 ("ac/llvm: port load_smem_amd behavior to load_global_amd")
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37292>
This commit is contained in:
Karol Herbst 2025-09-11 11:29:09 +02:00 • committed by Marge Bot
parent 9fbf29fc6d
commit 4f94ca6c96
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/amd/llvm/ac_nir_to_llvm.c
View file

@ -1892,9 +1892,10 @@ static LLVMValueRef get_global_address(struct ac_nir_context *ctx,
bool is_store = instr->intrinsic == nir_intrinsic_store_global_amd; bool is_store = instr->intrinsic == nir_intrinsic_store_global_amd;
nir_src addr_src = instr->src[is_store ? 1 : 0]; nir_src addr_src = instr->src[is_store ? 1 : 0];
LLVMValueRef addr = get_src(ctx, addr_src); LLVMValueRef addr = get_src(ctx, addr_src);
bool smem = nir_intrinsic_has_access(instr) && nir_intrinsic_access(instr) & ACCESS_SMEM_AMD;
unsigned address_space; unsigned address_space;
if (nir_intrinsic_access(instr) & ACCESS_SMEM_AMD) { if (smem) {
assert(!is_store); assert(!is_store);
if (addr_src.ssa->bit_size == 64) if (addr_src.ssa->bit_size == 64)
address_space = AC_ADDR_SPACE_CONST; address_space = AC_ADDR_SPACE_CONST;
@ -1920,7 +1921,7 @@ static LLVMValueRef get_global_address(struct ac_nir_context *ctx,
else else
addr = LLVMBuildGEP2(ctx->ac.builder, ctx->ac.i8, addr, &offset, 1, ""); addr = LLVMBuildGEP2(ctx->ac.builder, ctx->ac.i8, addr, &offset, 1, "");
if (nir_intrinsic_access(instr) & ACCESS_SMEM_AMD) if (smem)
LLVMSetMetadata(addr, ctx->ac.uniform_md_kind, ctx->ac.empty_md); LLVMSetMetadata(addr, ctx->ac.uniform_md_kind, ctx->ac.empty_md);
return addr; return addr;