AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: update outputs written nir info

Browse Source 
We may remove some outputs when si_nir_kill_outputs and
ac_nir_optimize_outputs, so update the outputs written
info for output lower pass to skip manipulating these
outputs.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20691>
This commit is contained in:
Qiang Yu
2023-01-04 10:11:59 +08:00
committed by Marge Bot
parent dcccd94faf
commit 59135678cf
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_shader.c
+12
View File
@@ -1685,6 +1685,9 @@ static void si_nir_assign_param_offsets(nir_shader *nir, struct si_shader *shade
struct si_shader_selector *sel = shader->selector;
struct si_shader_binary_info *info = &shader->info;
uint64_t outputs_written = 0;
uint32_t outputs_written_16bit = 0;
nir_function_impl *impl = nir_shader_get_entrypoint(nir);
assert(impl);
@@ -1704,6 +1707,11 @@ static void si_nir_assign_param_offsets(nir_shader *nir, struct si_shader *shade
assert(intr->num_components == 1); /* only scalar stores expected */
nir_io_semantics sem = nir_intrinsic_io_semantics(intr);
if (sem.location >= VARYING_SLOT_VAR0_16BIT)
outputs_written_16bit |= BITFIELD_BIT(sem.location - VARYING_SLOT_VAR0_16BIT);
else
outputs_written |= BITFIELD64_BIT(sem.location);
/* primitive id output is added by ngg lowering, so we don't have its
* output info pre-build in si_shader_info. It's handled at last of
* this function.
@@ -1738,6 +1746,10 @@ static void si_nir_assign_param_offsets(nir_shader *nir, struct si_shader *shade
info->vs_output_param_offset[VARYING_SLOT_PRIMITIVE_ID] = info->nr_param_exports++;
info->vs_output_param_mask |= BITFIELD64_BIT(sel->info.num_outputs);
}
/* Update outputs written info, we may remove some outputs before. */
nir->info.outputs_written = outputs_written;
nir->info.outputs_written_16bit = outputs_written_16bit;
}
static void si_assign_param_offsets(nir_shader *nir, struct si_shader *shader)