fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-03 15:28:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ir3/spill: extract child intervals for live-in reloads

Browse source 
When reloading live-ins, child intervals need to be extracted to ensure
we can add live-in phi nodes for them.

Fixes asserts with spillall for a bunch of ray_query and
ray_tracing_pipeline CTS tests:

src/freedreno/ir3/ir3_spill.c: add_live_in_phi: Assertion `entry' failed.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Fixes: 613eaac7b5 ("ir3: Initial support for spilling non-shared registers")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41756>
This commit is contained in:
Job Noorman 2026-05-22 17:20:58 +02:00 • committed by Marge Bot
parent 727a30f4c7
commit 360650d189
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/freedreno/ir3/ir3_spill.c
View file

@ -1507,6 +1507,29 @@ live_in_rewrite(struct ra_spill_ctx *ctx,
_mesa_hash_table_insert(state->remap, def, new_val);
}
static void
live_in_interval_rewrite(struct ra_spill_ctx *ctx,
struct ra_spill_interval *interval,
struct reg_or_immed *new_val, struct ir3_block *block,
unsigned pred_idx, struct ir3_cursor cursor)
{
live_in_rewrite(ctx, interval, new_val, block, pred_idx);
rb_tree_foreach (struct ra_spill_interval, child,
&interval->interval.children, interval.node) {
assert(!(new_val->flags & (IR3_REG_CONST | IR3_REG_IMMED)));
struct ir3_register *child_reg = child->interval.reg;
struct ir3_register *child_def = extract(
new_val->def,
(child_reg->interval_start - interval->interval.reg->interval_start) /
reg_elem_size(new_val->def),
reg_elems(child_reg), cursor);
struct reg_or_immed *child_val = ralloc(ctx, struct reg_or_immed);
child_val->def = child_def;
live_in_interval_rewrite(ctx, child, child_val, block, pred_idx, cursor);
}
}
static void
reload_live_in(struct ra_spill_ctx *ctx, struct ir3_register *def,
struct ir3_block *block)
@ -1531,7 +1554,8 @@ reload_live_in(struct ra_spill_ctx *ctx, struct ir3_register *def,
new_val->def = reload(ctx, def, ir3_before_terminator(pred));
new_val->flags = new_val->def->flags;
}
live_in_rewrite(ctx, interval, new_val, block, i);
live_in_interval_rewrite(ctx, interval, new_val, block, i,
ir3_before_terminator(pred));
}
}