freedreno/ir3: bit of ra refactor

Shuffle things slightly, passing instr-data to ra_name() to reduce the
number of places where we need to add support for array names.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_ra.c b/src/gallium/drivers/freedreno/ir3/ir3_ra.c
index bbe1cd1d2d6b77d7201fb6ea87cf41f3fc7772e2..88ca95acbbfe25d1c120760249b8e939ea31d67c 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_ra.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_ra.c
@@ -562,7 +562,7 @@ ra_init(struct ir3_ra_ctx *ctx)
 }
 
 static unsigned
-ra_name(struct ir3_ra_ctx *ctx, int cls, struct ir3_instruction *defn)
+__ra_name(struct ir3_ra_ctx *ctx, int cls, struct ir3_instruction *defn)
 {
        unsigned name;
        debug_assert(cls >= 0);
@@ -571,6 +571,13 @@ ra_name(struct ir3_ra_ctx *ctx, int cls, struct ir3_instruction *defn)
        return name;
 }
 
+static int
+ra_name(struct ir3_ra_ctx *ctx, struct ir3_ra_instr_data *id)
+{
+       /* TODO handle name mapping for arrays */
+       return __ra_name(ctx, id->cls, id->defn);
+}
+
 static void
 ra_destroy(struct ir3_ra_ctx *ctx)
 {
@@ -626,11 +633,8 @@ ra_block_compute_live_ranges(struct ir3_ra_ctx *ctx, struct ir3_block *block)
                if (writes_gpr(instr)) {
                        struct ir3_ra_instr_data *id = &ctx->instrd[instr->ip];
 
-                       /* arrays which don't fit in one of the pre-defined class
-                        * sizes are pre-colored:
-                        */
-                       if ((id->defn == instr) && (id->cls > 0)) {
-                               unsigned name = ra_name(ctx, id->cls, id->defn);
+                       if (id->defn == instr) {
+                               unsigned name = ra_name(ctx, id);
 
                                ctx->def[name] = id->defn->ip;
                                ctx->use[name] = id->defn->ip;
@@ -670,14 +674,10 @@ ra_block_compute_live_ranges(struct ir3_ra_ctx *ctx, struct ir3_block *block)
 
                foreach_ssa_src(src, instr) {
                        if (writes_gpr(src)) {
-                               struct ir3_ra_instr_data *id = &ctx->instrd[src->ip];
-
-                               if (id->cls >= 0) {
-                                       unsigned name = ra_name(ctx, id->cls, id->defn);
-                                       ctx->use[name] = MAX2(ctx->use[name], instr->ip);
-                                       if (!BITSET_TEST(bd->def, name))
-                                               BITSET_SET(bd->use, name);
-                               }
+                               unsigned name = ra_name(ctx, &ctx->instrd[src->ip]);
+                               ctx->use[name] = MAX2(ctx->use[name], instr->ip);
+                               if (!BITSET_TEST(bd->def, name))
+                                       BITSET_SET(bd->use, name);
                        }
                }
        }
@@ -765,12 +765,8 @@ ra_add_interference(struct ir3_ra_ctx *ctx)
        /* need to fix things up to keep outputs live: */
        for (unsigned i = 0; i < ir->noutputs; i++) {
                struct ir3_instruction *instr = ir->outputs[i];
-               struct ir3_ra_instr_data *id = &ctx->instrd[instr->ip];
-
-               if (id->cls >= 0) {
-                       unsigned name = ra_name(ctx, id->cls, id->defn);
-                       ctx->use[name] = ctx->instr_cnt;
-               }
+               unsigned name = ra_name(ctx, &ctx->instrd[instr->ip]);
+               ctx->use[name] = ctx->instr_cnt;
        }
 
        for (unsigned i = 0; i < ctx->alloc_count; i++) {
@@ -839,9 +835,8 @@ reg_assign(struct ir3_ra_ctx *ctx, struct ir3_register *reg,
                struct ir3_instruction *instr)
 {
        struct ir3_ra_instr_data *id = &ctx->instrd[instr->ip];
-
-       if (id->cls >= 0) {
-               unsigned name = ra_name(ctx, id->cls, id->defn);
+       if (id->defn) {
+               unsigned name = ra_name(ctx, id);
                unsigned r = ra_get_node_reg(ctx->g, name);
                unsigned num = ctx->set->ra_reg_to_gpr[r] + id->off;
 
@@ -895,7 +890,7 @@ ra_alloc(struct ir3_ra_ctx *ctx)
                if (ctx->frag_face && (i < ir->ninputs) && ir->inputs[i]) {
                        struct ir3_instruction *instr = ir->inputs[i];
                        int cls = size_to_class(1, true);
-                       unsigned name = ra_name(ctx, cls, instr);
+                       unsigned name = __ra_name(ctx, cls, instr);
                        unsigned reg = ctx->set->gpr_to_ra_reg[cls][0];
 
                        /* if we have frag_face, it gets hr0.x */
@@ -911,7 +906,7 @@ ra_alloc(struct ir3_ra_ctx *ctx)
                                if (id->defn == instr) {
                                        unsigned name, reg;
 
-                                       name = ra_name(ctx, id->cls, id->defn);
+                                       name = ra_name(ctx, id);
                                        reg = ctx->set->gpr_to_ra_reg[id->cls][j];
 
                                        ra_set_node_reg(ctx->g, name, reg);