fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 20:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir3/legalize: insert (sy) to read consts after ldc.k

Browse source 
Observed when reading consts in the preamble using alias.rt.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31222>
This commit is contained in:
Job Noorman 2025-01-22 15:33:48 +01:00 • committed by Marge Bot
parent 96e08c3859
commit a7a357f91d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/ir3/ir3_legalize.c
View file

@ -52,6 +52,7 @@ struct ir3_legalize_state {
regmask_t needs_ss_or_sy_scalar_war;
regmask_t needs_sy;
bool needs_ss_for_const;
bool needs_sy_for_const;
/* Each of these arrays contains the cycle when the corresponding register
* becomes "ready" i.e. does not require any more nops. There is a special
@ -125,6 +126,7 @@ apply_sy(struct ir3_instruction *instr,
regmask_init(&state->needs_sy, mergedregs);
regmask_init(&state->needs_ss_or_sy_war, mergedregs);
regmask_init(&state->needs_ss_or_sy_scalar_war, mergedregs);
state->needs_sy_for_const = false;
}
static bool
@ -359,6 +361,7 @@ legalize_block(struct ir3_legalize_ctx *ctx, struct ir3_block *block)
&pstate->needs_ss_or_sy_war);
regmask_or(&state->needs_sy, &state->needs_sy, &pstate->needs_sy);
state->needs_ss_for_const |= pstate->needs_ss_for_const;
state->needs_sy_for_const |= pstate->needs_sy_for_const;
/* Our nop state is the max of the predecessor blocks */
for (unsigned i = 0; i < ARRAY_SIZE(state->pred_ready); i++)
@ -517,6 +520,9 @@ legalize_block(struct ir3_legalize_ctx *ctx, struct ir3_block *block)
apply_ss(n, state, mergedregs);
last_input_needs_ss = false;
}
if (state->needs_sy_for_const) {
apply_sy(n, state, mergedregs);
}
} else if (reg_is_addr1(reg) && block->in_early_preamble) {
if (regmask_get(&state->needs_ss, reg)) {
apply_ss(n, state, mergedregs);
@ -646,6 +652,8 @@ legalize_block(struct ir3_legalize_ctx *ctx, struct ir3_block *block)
}
} else if (n->opc == OPC_PUSH_CONSTS_LOAD_MACRO || n->opc == OPC_STC) {
state->needs_ss_for_const = true;
} else if (n->opc == OPC_LDC_K) {
state->needs_sy_for_const = true;
}
if (is_ssbo(n->opc) || is_global_a3xx_atomic(n->opc) ||