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

ac/nir: don't consider quads incomplete inside loops

Browse source 
We move terminates to outside loops, so this doesn't matter anymore.

fossil-db (gfx1201):
Totals from 145 (0.18% of 79839) affected shaders:
Instrs: 174693 -> 174389 (-0.17%); split: -0.18%, +0.01%
CodeSize: 917068 -> 915692 (-0.15%); split: -0.16%, +0.01%
VGPRs: 8340 -> 8184 (-1.87%)
Latency: 2528888 -> 2521006 (-0.31%); split: -0.48%, +0.16%
InvThroughput: 502383 -> 504082 (+0.34%); split: -0.44%, +0.78%
Copies: 15968 -> 15632 (-2.10%); split: -2.14%, +0.04%
PreVGPRs: 5918 -> 5858 (-1.01%)
VALU: 92802 -> 92484 (-0.34%); split: -0.35%, +0.01%
SALU: 29437 -> 29430 (-0.02%)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37561>
This commit is contained in:
Rhys Perry 2025-10-06 14:32:56 +01:00 • committed by Marge Bot
parent 9babec1366
commit f3ff2375ec
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/amd/common/nir/ac_nir_lower_tex.c
View file

@ -280,7 +280,6 @@ struct move_tex_coords_state {
};
struct loop_if_state {
bool inside_loop;
unsigned prev_terminate;
unsigned prev_break_continue;
};
@ -324,8 +323,7 @@ static bool can_optimize_txd(nir_shader *shader, struct loop_if_state *loop_if,
if (!size)
return false;
bool incomplete_quad =
tex->instr.block->divergent || loop_if->prev_terminate || loop_if->inside_loop;
bool incomplete_quad = tex->instr.block->divergent || loop_if->prev_terminate;
*need_strict_wqm_coord = false;
if (incomplete_quad) {
@ -482,11 +480,7 @@ static bool move_coords_from_divergent_cf(struct move_tex_coords_state *state,
if (top_level && !loop_if->prev_terminate)
state->toplevel_b.cursor = nir_before_instr(instr);
/* Assume quads might be incomplete when inside loops in case of a
* divergent terminate from a previous iteration.
*/
bool incomplete_quad =
block->divergent || loop_if->prev_terminate || loop_if->inside_loop;
bool incomplete_quad = block->divergent || loop_if->prev_terminate;
if (instr->type == nir_instr_type_tex) {
nir_tex_instr *tex = nir_instr_as_tex(instr);
@ -548,7 +542,6 @@ static bool move_coords_from_divergent_cf(struct move_tex_coords_state *state,
nir_loop *loop = nir_cf_node_as_loop(cf_node);
assert(!nir_loop_has_continue_construct(loop));
struct loop_if_state inner = *loop_if;
inner.inside_loop = true;
progress |= move_coords_from_divergent_cf(state, &inner, &loop->body);
loop_if->prev_terminate = inner.prev_terminate;
break;
@ -576,7 +569,6 @@ ac_nir_lower_tex(nir_shader *nir, const ac_nir_lower_tex_options *options)
state.num_wqm_vgprs = 0;
struct loop_if_state loop_if;
loop_if.inside_loop = false;
loop_if.prev_terminate = 0;
loop_if.prev_break_continue = 0;
bool impl_progress = move_coords_from_divergent_cf(&state, &loop_if, &impl->body);