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

pan/bi: Pull out size recording

Browse source 
We need this again afterwards to record sizes again after
repairing ssa form.

Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39305>
This commit is contained in:
Christoph Pillmayer 2025-12-15 13:50:34 +01:00 • committed by Marge Bot
parent 4bbd314580
commit 0e55a87901
2 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/panfrost/compiler/bifrost/bi_spill_ssa.c
View file

@ -1395,6 +1395,40 @@ min_algorithm(struct spill_ctx *ctx)
util_dynarray_fini(&local_next_ip);
}
void
bi_record_sizes(bi_context *ctx, uint32_t *sizes)
{
bi_foreach_instr_global(ctx, I) {
if (I->nr_dests == 0 || I->dest[0].type != BI_INDEX_NORMAL)
continue;
unsigned idx = I->dest[0].value;
bi_foreach_ssa_dest(I, d) {
idx = I->dest[d].value;
assert(sizes[idx] == 0 && "SSA broken");
switch (I->op) {
case BI_OPCODE_PHI:
break;
default:
sizes[idx] = bi_count_write_registers(I, d);
break;
}
}
}
/* now that we know the rest of the sizes, find the sizes for PHI nodes */
bi_foreach_block(ctx, block) {
bi_foreach_phi_in_block(block, I) {
if (I->dest[0].type != BI_INDEX_NORMAL)
continue;
unsigned idx = I->dest[0].value;
sizes[idx] = 1;
bi_foreach_ssa_src(I, s) {
sizes[idx] = MAX2(sizes[idx], sizes[I->src[s].value]);
}
}
}
}
static void
record_ssa_defs(bi_context *ctx, bi_instr **defs, bi_block **blocks)
{
@ -1447,37 +1481,16 @@ bi_spill_ssa(bi_context *ctx, unsigned k, unsigned spill_base)
uint32_t *sizes = rzalloc_array(memctx, uint32_t, ctx->ssa_alloc + max_temps);
/* now record instructions that can be easily re-materialized */
/* while we're at it, calculate sizes too */
bi_foreach_instr_global(ctx, I) {
if (I->nr_dests == 0 || I->dest[0].type != BI_INDEX_NORMAL)
continue;
unsigned idx = I->dest[0].value;
if (can_remat(I))
remat[idx] = I;
bi_foreach_ssa_dest(I, d) {
idx = I->dest[d].value;
assert(sizes[idx] == 0 && "SSA broken");
switch (I->op) {
case BI_OPCODE_PHI:
break;
default:
sizes[idx] = bi_count_write_registers(I, d);
break;
}
}
}
/* now that we know the rest of the sizes, find the sizes for PHI nodes */
bi_foreach_block(ctx, block) {
bi_foreach_phi_in_block(block, I) {
if (I->dest[0].type != BI_INDEX_NORMAL)
continue;
unsigned idx = I->dest[0].value;
sizes[idx] = 1;
bi_foreach_ssa_src(I, s) {
sizes[idx] = MAX2(sizes[idx], sizes[I->src[s].value]);
}
}
}
bi_record_sizes(ctx, sizes);
struct spill_block *blocks =
rzalloc_array(memctx, struct spill_block, ctx->num_blocks);

3
src/panfrost/compiler/bifrost/compiler.h
View file

@ -1488,6 +1488,9 @@ unsigned bi_calc_register_demand(bi_context *ctx);
void bi_postra_liveness(bi_context *ctx);
uint64_t MUST_CHECK bi_postra_liveness_ins(uint64_t live, bi_instr *ins);
/* Record sizes of SSA values into the provided array. */
void bi_record_sizes(bi_context *ctx, uint32_t *sizes);
/* SSA spilling; returns number of spilled registers */
unsigned bi_spill_ssa(bi_context *ctx, unsigned num_registers, unsigned tls_size);