From db566904baa96c9f3c19aaac3e8e99bc0ebb4dc7 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Sun, 31 Oct 2021 16:01:02 +0100 Subject: [PATCH] ir3/spill: Mark root as non-spillable after inserting We have to mark the root as non-spillable in case the interval is the child of some other interval, but we can't know whether it's the child of some other interval until it's been inserted. Move the setting of cant_spill below the insertion. This prevents us from using a bogus parent value. Fixes: 613eaac7b53 ("ir3: Initial support for spilling non-shared registers") Part-of: --- src/freedreno/ir3/ir3_spill.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/freedreno/ir3/ir3_spill.c b/src/freedreno/ir3/ir3_spill.c index 38627f4db02..43cad0a4366 100644 --- a/src/freedreno/ir3/ir3_spill.c +++ b/src/freedreno/ir3/ir3_spill.c @@ -520,14 +520,14 @@ insert_src(struct ra_spill_ctx *ctx, struct ir3_register *src) { struct ra_spill_interval *interval = ctx->intervals[src->def->name]; + if (!interval->interval.inserted) { + ra_spill_ctx_insert(ctx, interval); + interval->needs_reload = true; + interval->already_spilled = true; + } + ra_spill_interval_root(interval)->cant_spill = true; - if (interval->interval.inserted) - return; - - ra_spill_ctx_insert(ctx, interval); - interval->needs_reload = true; - interval->already_spilled = true; } static void