pan/midgard: Simplify spillability test

Let's not worry about spilling twice in a bundle; that's too
restrictive. We'll need to change the schedule itself -- unfortunately,
this can have second-order effects due to pipeline registers.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>

diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index 7bd34f725e66b378397797daf6ba86bb6d39125c..d73d745213e0332ea11b3296f58129f752d2785b 100644 (file)
--- a/src/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
@@ -704,36 +704,18 @@ mir_choose_spill_node(
         for (unsigned i = 0; i < ctx->temp_count; ++i)
                 lcra_set_node_spill_cost(l, i, cost[i]);
 
-        /* We can't spill any bundles that contain unspills. This could be
-         * optimized to allow use of r27 to spill twice per bundle, but if
-         * you're at the point of optimizing spilling, it's too late.
-         *
-         * We also can't double-spill. */
+        /* We can't spill a previously spilled value or an unspill */
 
-        mir_foreach_block(ctx, block) {
-                mir_foreach_bundle_in_block(block, bun) {
-                        bool no_spill = false;
-
-                        for (unsigned i = 0; i < bun->instruction_count; ++i) {
-                                no_spill |= bun->instructions[i]->no_spill;
-
-                                if (bun->instructions[i]->no_spill) {
-                                        mir_foreach_src(bun->instructions[i], s) {
-                                                unsigned src = bun->instructions[i]->src[s];
-
-                                                if (src < ctx->temp_count)
-                                                        lcra_set_node_spill_cost(l, src, -1);
-                                        }
-                                }
-                        }
+        mir_foreach_instr_global(ctx, ins) {
+                if (ins->no_spill) {
+                        if (ins->dest < ctx->temp_count)
+                                lcra_set_node_spill_cost(l, ins->dest, -1);
 
-                        if (!no_spill)
-                                continue;
+                        mir_foreach_src(ins, s) {
+                                unsigned src = ins->src[s];
 
-                        for (unsigned i = 0; i < bun->instruction_count; ++i) {
-                                unsigned dest = bun->instructions[i]->dest;
-                                if (dest < ctx->temp_count)
-                                        lcra_set_node_spill_cost(l, dest, -1);
+                                if (src < ctx->temp_count)
+                                        lcra_set_node_spill_cost(l, src, -1);
                         }
                 }
         }