pan/mdg: eliminate references to ins->alu.reg_mode

[mesa.git] / src / panfrost / midgard / midgard_liveness.c

diff --git a/src/panfrost/midgard/midgard_liveness.c b/src/panfrost/midgard/midgard_liveness.c
index 08f8a07bcee1f97c9c3d0105f8ed9b7962746d02..af7fba9939c97ece7168cc205fd1af98c853b81a 100644 (file)
--- a/src/panfrost/midgard/midgard_liveness.c
+++ b/src/panfrost/midgard/midgard_liveness.c
@@ -22,98 +22,28 @@
  */
 
 #include "compiler.h"
-#include "util/u_memory.h"
-
-/* Routines for liveness analysis. Liveness is tracked per byte per node. Per
- * byte granularity is necessary for proper handling of int8 */
-
-static void
-liveness_gen(uint16_t *live, unsigned node, unsigned max, uint16_t mask)
-{
-        if (node >= max)
-                return;
-
-        live[node] |= mask;
-}
-
-static void
-liveness_kill(uint16_t *live, unsigned node, unsigned max, uint16_t mask)
-{
-        if (node >= max)
-                return;
-
-        live[node] &= ~mask;
-}
-
-static bool
-liveness_get(uint16_t *live, unsigned node, uint16_t max) {
-        if (node >= max)
-                return false;
-
-        return live[node];
-}
-
-/* Updates live_in for a single instruction */
 
 void
 mir_liveness_ins_update(uint16_t *live, midgard_instruction *ins, unsigned max)
 {
         /* live_in[s] = GEN[s] + (live_out[s] - KILL[s]) */
 
-        liveness_kill(live, ins->dest, max, mir_bytemask(ins));
+        pan_liveness_kill(live, ins->dest, max, mir_bytemask(ins));
 
         mir_foreach_src(ins, src) {
                 unsigned node = ins->src[src];
                 unsigned bytemask = mir_bytemask_of_read_components(ins, node);
 
-                liveness_gen(live, node, max, bytemask);
+                pan_liveness_gen(live, node, max, bytemask);
         }
 }
 
-/* live_out[s] = sum { p in succ[s] } ( live_in[p] ) */
-
 static void
-liveness_block_live_out(compiler_context *ctx, midgard_block *blk)
+mir_liveness_ins_update_wrap(uint16_t *live, void *ins, unsigned max)
 {
-        mir_foreach_successor(blk, succ) {
-                for (unsigned i = 0; i < ctx->temp_count; ++i)
-                        blk->live_out[i] |= succ->live_in[i];
-        }
-}
-
-/* Liveness analysis is a backwards-may dataflow analysis pass. Within a block,
- * we compute live_out from live_in. The intrablock pass is linear-time. It
- * returns whether progress was made. */
-
-static bool
-liveness_block_update(compiler_context *ctx, midgard_block *blk)
-{
-        bool progress = false;
-
-        liveness_block_live_out(ctx, blk);
-
-        uint16_t *live = mem_dup(blk->live_out, ctx->temp_count * sizeof(uint16_t));
-
-        mir_foreach_instr_in_block_rev(blk, ins)
-                mir_liveness_ins_update(live, ins, ctx->temp_count);
-
-        /* To figure out progress, diff live_in */
-
-        for (unsigned i = 0; (i < ctx->temp_count) && !progress; ++i)
-                progress |= (blk->live_in[i] != live[i]);
-
-        free(blk->live_in);
-        blk->live_in = live;
-
-        return progress;
+        mir_liveness_ins_update(live, (midgard_instruction *) ins, max);
 }
 
-/* Globally, liveness analysis uses a fixed-point algorithm based on a
- * worklist. We initialize a work list with the exit block. We iterate the work
- * list to compute live_in from live_out for each block on the work list,
- * adding the predecessors of the block to the work list if we made progress.
- */
-
 void
 mir_compute_liveness(compiler_context *ctx)
 {
@@ -122,42 +52,7 @@ mir_compute_liveness(compiler_context *ctx)
                 return;
 
         mir_compute_temp_count(ctx);
-
-        /* List of midgard_block */
-        struct set *work_list = _mesa_set_create(ctx,
-                        _mesa_hash_pointer,
-                        _mesa_key_pointer_equal);
-
-        /* Allocate */
-
-        mir_foreach_block(ctx, block) {
-                block->live_in = calloc(ctx->temp_count, sizeof(uint16_t));
-                block->live_out = calloc(ctx->temp_count, sizeof(uint16_t));
-        }
-
-        /* Initialize the work list with the exit block */
-        struct set_entry *cur;
-
-        midgard_block *exit = mir_exit_block(ctx);
-        cur = _mesa_set_add(work_list, exit);
-
-        /* Iterate the work list */
-
-        do {
-                /* Pop off a block */
-                midgard_block *blk = (struct midgard_block *) cur->key;
-                _mesa_set_remove(work_list, cur);
-
-                /* Update its liveness information */
-                bool progress = liveness_block_update(ctx, blk);
-
-                /* If we made progress, we need to process the predecessors */
-
-                if (progress || (blk == exit)) {
-                        mir_foreach_predecessor(blk, pred)
-                                _mesa_set_add(work_list, pred);
-                }
-        } while((cur = _mesa_set_next_entry(work_list, NULL)) != NULL);
+        pan_compute_liveness(&ctx->blocks, ctx->temp_count, mir_liveness_ins_update_wrap);
 
         /* Liveness is now valid */
         ctx->metadata |= MIDGARD_METADATA_LIVENESS;
@@ -172,19 +67,10 @@ mir_invalidate_liveness(compiler_context *ctx)
         if (!(ctx->metadata & MIDGARD_METADATA_LIVENESS))
                 return;
 
+        pan_free_liveness(&ctx->blocks);
+
         /* It's now invalid regardless */
         ctx->metadata &= ~MIDGARD_METADATA_LIVENESS;
-
-        mir_foreach_block(ctx, block) {
-                if (block->live_in)
-                        free(block->live_in);
-
-                if (block->live_out)
-                        free(block->live_out);
-
-                block->live_in = NULL;
-                block->live_out = NULL;
-        }
 }
 
 bool
@@ -194,7 +80,7 @@ mir_is_live_after(compiler_context *ctx, midgard_block *block, midgard_instructi
 
         /* Check whether we're live in the successors */
 
-        if (liveness_get(block->live_out, src, ctx->temp_count))
+        if (pan_liveness_get(block->base.live_out, src, ctx->temp_count))
                 return true;
 
         /* Check the rest of the block for liveness */