fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3: Move a6xx's get_ssbo_size shl to NIR.

Browse source 
Just cleaning up a TODO.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12258>
This commit is contained in:
Eric Anholt 2021-03-11 11:14:07 -08:00 • committed by Marge Bot
parent 547a2aa051
commit 994793c500
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/freedreno/ir3/ir3_compiler_nir.c
View file

@ -867,14 +867,7 @@ emit_intrinsic_ssbo_size(struct ir3_context *ctx, nir_intrinsic_instr *intr,
ir3_handle_bindless_cat6(resinfo, intr->src[0]);
if (ctx->compiler->gen >= 6) {
struct ir3_instruction *resinfo_dst;
ir3_split_dest(b, &resinfo_dst, resinfo, 0, 1);
/* Unfortunately resinfo returns the array length, i.e. in dwords,
* while NIR expects us to return the size in bytes.
*
* TODO: fix this in NIR.
*/
*dst = ir3_SHL_B(b, resinfo_dst, 0, create_immed(b, 2), 0);
ir3_split_dest(b, dst, resinfo, 0, 1);
} else {
/* On a5xx, resinfo returns the low 16 bits of ssbo size in .x and the high 16 bits in .y */
struct ir3_instruction *resinfo_dst[2];

30
src/freedreno/ir3/ir3_nir.c
View file

@ -292,6 +292,33 @@ should_split_wrmask(const nir_instr *instr, const void *data)
}
}
static bool
ir3_nir_lower_ssbo_size_filter(const nir_instr *instr, const void *data)
{
return instr->type == nir_instr_type_intrinsic &&
nir_instr_as_intrinsic(instr)->intrinsic ==
nir_intrinsic_get_ssbo_size;
}
static nir_ssa_def *
ir3_nir_lower_ssbo_size_instr(nir_builder *b, nir_instr *instr, void *data)
{
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
return nir_ishl(b, &intr->dest.ssa, nir_imm_int(b, 2));
}
/**
* The resinfo opcode we have for getting the SSBO size on a6xx returns a number
* of dwords, while the NIR intrinsic coming in is a number of bytes. Switch
* things so the NIR intrinsic in our backend means dwords.
*/
static bool
ir3_nir_lower_ssbo_size(nir_shader *s)
{
return nir_shader_lower_instructions(s, ir3_nir_lower_ssbo_size_filter,
ir3_nir_lower_ssbo_size_instr, NULL);
}
void
ir3_nir_lower_io_to_temporaries(nir_shader *s)
{
@ -535,6 +562,9 @@ ir3_nir_post_finalize(struct ir3_compiler *compiler, nir_shader *s)
NIR_PASS_V(s, nir_lower_image, &lower_image_opts);
NIR_PASS_V(s, nir_lower_idiv, &idiv_options); /* idiv generated by cube lowering */
if (compiler->gen >= 6)
OPT_V(s, ir3_nir_lower_ssbo_size);
ir3_optimize_loop(compiler, s);
}