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

pco: add NIR global_atomic lowering

Browse source 
PCO has global_atomic_{,_swap}pco intrinsics that are different from
generic 2x32 ones, but the 2x32 ones are emitted by
nir_lower_explicit_io.

Add code to lower the generic 2x32 intrinsics to the PCO variant.

Passed Vulkan CTS dEQP-VK.glsl.atomic_operations.* and fixes crash of
dEQP-VK.glsl.atomic_operations.*_reference .

Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
Reviewed-by: Simon Perretta <simon.perretta@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39054>
This commit is contained in:
Icenowy Zheng 2025-12-21 16:57:16 +08:00 • committed by Marge Bot
parent 3e7f38efa8
commit aa6208b6b7
1 changed files with 65 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/imagination/pco/pco_nir_sync.c
View file

@ -95,7 +95,8 @@ bool pco_nir_lower_barriers(nir_shader *shader, pco_data *data)
return progress;
}
static nir_def *lower_atomic(nir_builder *b, nir_instr *instr, void *cb_data)
static nir_def *
lower_usclib_atomic(nir_builder *b, nir_instr *instr, void *cb_data)
{
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
bool *uses_usclib = cb_data;
@ -140,15 +141,63 @@ static nir_def *lower_atomic(nir_builder *b, nir_instr *instr, void *cb_data)
value_swap);
}
static bool lower_global_atomic_intrinsic(nir_builder *b,
nir_intrinsic_instr *intrin,
UNUSED void *data)
{
nir_intrinsic_op op;
bool is_swap = false;
switch (intrin->intrinsic) {
case nir_intrinsic_global_atomic_2x32:
op = nir_intrinsic_global_atomic_pco;
break;
case nir_intrinsic_global_atomic_swap_2x32:
op = nir_intrinsic_global_atomic_swap_pco;
is_swap = true;
break;
default:
return false;
}
nir_src *addr_src = &intrin->src[0];
nir_src *data_src = &intrin->src[1];
nir_src *data2_src;
if (is_swap)
data2_src = &intrin->src[2];
b->cursor = nir_before_instr(&intrin->instr);
nir_def *new_src = nir_pad_vector(b, addr_src->ssa, is_swap ? 4 : 3);
new_src = nir_vector_insert_imm(b, new_src, data_src->ssa, 2);
if (is_swap)
new_src = nir_vector_insert_imm(b, new_src, data2_src->ssa, 3);
nir_intrinsic_instr *new_intrin = nir_intrinsic_instr_create(b->shader, op);
new_intrin->num_components = intrin->num_components;
nir_def_init(&new_intrin->instr,
&new_intrin->def,
intrin->def.num_components,
intrin->def.bit_size);
new_intrin->src[0] = nir_src_for_ssa(new_src);
assert(nir_intrinsic_has_atomic_op(intrin));
nir_intrinsic_set_atomic_op(new_intrin, nir_intrinsic_atomic_op(intrin));
nir_builder_instr_insert(b, &new_intrin->instr);
nir_def_rewrite_uses(&intrin->def, &new_intrin->def);
nir_instr_remove(&intrin->instr);
return true;
}
/**
* \brief Filters lowerable atomic instructions.
* \brief Filters atomic instructions emulated with usclib.
*
* \param[in] instr NIR instruction.
* \param[in] cb_data User callback data.
* \return True if the instruction matches the filter.
*/
static bool is_lowerable_atomic(const nir_instr *instr,
UNUSED const void *cb_data)
static bool atomic_uses_usclib(const nir_instr *instr,
UNUSED const void *cb_data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
@ -167,10 +216,18 @@ static bool is_lowerable_atomic(const nir_instr *instr,
*/
bool pco_nir_lower_atomics(nir_shader *shader, pco_data *data)
{
return nir_shader_lower_instructions(shader,
is_lowerable_atomic,
lower_atomic,
&data->common.uses.usclib);
bool progress = false;
progress |= nir_shader_intrinsics_pass(shader,
lower_global_atomic_intrinsic,
nir_metadata_none,
NULL);
progress |= nir_shader_lower_instructions(shader,
atomic_uses_usclib,
lower_usclib_atomic,
&data->common.uses.usclib);
return progress;
}
static nir_def *