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

radeonsi: implement remove_streamout in si_nir_kill_outputs

Browse Source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34492>
This commit is contained in:
Marek Olšák
2025-04-11 16:07:26 -04:00
committed by Marge Bot
parent 100f9a1624
commit 32274ab50e
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_shader.c
+27 -1
View File
@@ -1647,12 +1647,19 @@ static bool si_nir_kill_outputs(nir_shader *nir, const union si_shader_key *key)
!key->ge.opt.kill_pointsize &&
!key->ge.opt.kill_layer &&
!key->ge.opt.kill_clip_distances &&
!(nir->info.outputs_written & BITFIELD64_BIT(VARYING_SLOT_LAYER))) {
!(nir->info.outputs_written & BITFIELD64_BIT(VARYING_SLOT_LAYER)) &&
!key->ge.opt.remove_streamout &&
!key->ge.mono.remove_streamout) {
return nir_no_progress(impl);
}
bool progress = false;
if ((key->ge.opt.remove_streamout || key->ge.mono.remove_streamout) && nir->xfb_info) {
ralloc_free(nir->xfb_info);
nir->xfb_info = NULL;
}
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
@@ -1669,6 +1676,25 @@ static bool si_nir_kill_outputs(nir_shader *nir, const union si_shader_key *key)
assert(intr->num_components == 1); /* only scalar stores expected */
nir_io_semantics sem = nir_intrinsic_io_semantics(intr);
if ((key->ge.opt.remove_streamout || key->ge.mono.remove_streamout) &&
nir_instr_xfb_write_mask(intr)) {
/* Remove the output store if the output is not used as a sysval or varying. */
if ((sem.no_sysval_output ||
!nir_slot_is_sysval_output(sem.location, MESA_SHADER_FRAGMENT)) &&
(sem.no_varying ||
!nir_slot_is_varying(sem.location, MESA_SHADER_FRAGMENT))) {
nir_instr_remove(instr);
progress = true;
continue;
}
/* Clear xfb info if the output is used as a sysval or varying. */
static const nir_io_xfb zeroed;
nir_intrinsic_set_io_xfb(intr, zeroed);
nir_intrinsic_set_io_xfb2(intr, zeroed);
progress = true;
}
if (nir_slot_is_varying(sem.location, MESA_SHADER_FRAGMENT) &&
key->ge.opt.kill_outputs &
(1ull << si_shader_io_get_unique_index(sem.location)))