mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

ac/llvm: allow image loads to return less than 4 components, trim DMASK 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28607>
This commit is contained in:
Marek Olšák 2024-04-05 21:50:00 -04:00
parent c91b56c271
commit ce7ca0d80b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/llvm/ac_nir_to_llvm.c
View File

@ -2326,7 +2326,7 @@ static LLVMValueRef visit_image_load(struct ac_nir_context *ctx, const nir_intri
args.opcode = ac_image_load;
args.resource = ctx->abi->load_sampler_desc(ctx->abi, dynamic_index, AC_DESC_FMASK);
get_image_coords(ctx, instr, dynamic_index, &args, GLSL_SAMPLER_DIM_2D, is_array);
args.dmask = 0xf;
args.dmask = 0x1;
args.dim = is_array ? ac_image_2darray : ac_image_2d;
args.attributes = AC_ATTR_INVARIANT_LOAD;
args.a16 = ac_get_elem_bits(&ctx->ac, LLVMTypeOf(args.coords[0])) == 16;
@ -2341,7 +2341,10 @@ static LLVMValueRef visit_image_load(struct ac_nir_context *ctx, const nir_intri
args.dim = ac_get_image_dim(ctx->ac.gfx_level, dim, is_array);
if (!level_zero)
args.lod = get_src(ctx, instr->src[3]);
args.dmask = 15;
/* TODO: Fix in LLVM. LLVM doesn't reduce DMASK for D16 if optimization barriers are
* present and even if the vector is trimmed before the optimization barriers.
*/
args.dmask = BITFIELD_MASK(instr->def.num_components);
args.attributes = access & ACCESS_CAN_REORDER ? AC_ATTR_INVARIANT_LOAD : 0;
args.d16 = instr->def.bit_size == 16;
args.a16 = ac_get_elem_bits(&ctx->ac, LLVMTypeOf(args.coords[0])) == 16;
@ -2366,6 +2369,9 @@ static LLVMValueRef visit_image_load(struct ac_nir_context *ctx, const nir_intri
res = ac_build_gather_values(&ctx->ac, values, 4 + args.tfe);
}
if (instr->def.num_components < 4)
res = ac_trim_vector(&ctx->ac, res, instr->def.num_components);
return exit_waterfall(ctx, &wctx, res);
}