From 2d540b80746bc20c1e5de94a6933837fc6cf0c64 Mon Sep 17 00:00:00 2001 From: Job Noorman Date: Thu, 27 Feb 2025 19:45:21 +0100 Subject: [PATCH] ir3/ra: prevent reusing parent interval of reloaded sources We would set the `src` flag on the interval of reloaded sources. However, the interval might be merged with its parent when inserted and the parent wouldn't have this flag set. This caused the parent interval to potentially be reused to reload later sources. Fix this by setting the `src` flag on the top-level interval after insertion. Signed-off-by: Job Noorman Fixes: fa22b0901af ("ir3/ra: Add specialized shared register RA/spilling") Part-of: --- src/freedreno/ir3/ir3_shared_ra.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/freedreno/ir3/ir3_shared_ra.c b/src/freedreno/ir3/ir3_shared_ra.c index bc890e0b63b..8bf9728b9ae 100644 --- a/src/freedreno/ir3/ir3_shared_ra.c +++ b/src/freedreno/ir3/ir3_shared_ra.c @@ -734,6 +734,10 @@ reload_src(struct ra_ctx *ctx, struct ir3_instruction *instr, interval->physreg_end = best_reg + size; interval->needs_reload = true; ir3_reg_interval_insert(&ctx->reg_ctx, &interval->interval); + + while (interval->interval.parent) + interval = ir3_reg_interval_to_ra_interval(interval->interval.parent); + interval->src = true; }