X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fpanfrost%2Fbifrost%2Fbi_print.c;h=95b4e51fbecea345cdefe06c11068230319fce13;hb=95e3776d3e0119f679bfb467028ed09226fdf95d;hp=81b0f4aa0fce3f8680546c07e97fd10a2ccbe38c;hpb=5c7ee8a9746b1ae7d852b1ae3e5408378547c156;p=mesa.git

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index 81b0f4aa0fc..95b4e51fbec 100644
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -26,6 +26,24 @@
 
 #include "bi_print.h"
 
+const char *
+bi_clause_type_name(enum bifrost_clause_type T)
+{
+        switch (T) {
+        case BIFROST_CLAUSE_NONE: return "";
+        case BIFROST_CLAUSE_LOAD_VARY: return "load_vary";
+        case BIFROST_CLAUSE_UBO: return "ubo";
+        case BIFROST_CLAUSE_TEX: return "tex";
+        case BIFROST_CLAUSE_SSBO_LOAD: return "load";
+        case BIFROST_CLAUSE_SSBO_STORE: return "store";
+        case BIFROST_CLAUSE_BLEND: return "blend";
+        case BIFROST_CLAUSE_FRAGZ: return "fragz";
+        case BIFROST_CLAUSE_ATEST: return "atest";
+        case BIFROST_CLAUSE_64BIT: return "64";
+        default: return "??";
+        }
+}
+
 const char *
 bi_output_mod_name(enum bifrost_outmod mod)
 {
@@ -105,7 +123,7 @@ bi_ldst_type_name(enum bifrost_ldst_type type)
 /* The remaining functions in this file are for IR-internal
  * structures; the disassembler doesn't use them */
 
-static const char *
+const char *
 bi_class_name(enum bi_class cl)
 {
         switch (cl) {
@@ -115,30 +133,66 @@ bi_class_name(enum bi_class cl)
         case BI_CMP: return "cmp";
         case BI_BLEND: return "blend";
         case BI_BITWISE: return "bitwise";
+        case BI_COMBINE: return "combine";
         case BI_CONVERT: return "convert";
         case BI_CSEL: return "csel";
         case BI_DISCARD: return "discard";
-        case BI_EXTRACT: return "extract";
         case BI_FMA: return "fma";
+        case BI_FMOV: return "fmov";
         case BI_FREXP: return "frexp";
+        case BI_IMATH: return "imath";
         case BI_LOAD: return "load";
+        case BI_LOAD_UNIFORM: return "load_uniform";
         case BI_LOAD_ATTR: return "load_attr";
         case BI_LOAD_VAR: return "load_var";
         case BI_LOAD_VAR_ADDRESS: return "load_var_address";
-        case BI_MAKE_VEC: return "make_vec";
         case BI_MINMAX: return "minmax";
         case BI_MOV: return "mov";
+        case BI_SELECT: return "select";
         case BI_SHIFT: return "shift";
         case BI_STORE: return "store";
         case BI_STORE_VAR: return "store_var";
         case BI_SPECIAL: return "special";
-        case BI_SWIZZLE: return "swizzle";
+        case BI_TABLE: return "table";
         case BI_TEX: return "tex";
         case BI_ROUND: return "round";
         default: return "unknown_class";
         }
 }
 
+static bool
+bi_print_dest_index(FILE *fp, bi_instruction *ins, unsigned index)
+{
+        if (!index)
+                fprintf(fp, "_");
+        else if (index & BIR_INDEX_REGISTER)
+                fprintf(fp, "br%u", index & ~BIR_INDEX_REGISTER);
+        else if (index & PAN_IS_REG)
+                fprintf(fp, "r%u", index >> 1);
+        else if (!(index & BIR_SPECIAL))
+                fprintf(fp, "%u", (index >> 1) - 1);
+        else
+                return false;
+
+        return true;
+}
+
+static void
+bi_print_index(FILE *fp, bi_instruction *ins, unsigned index, unsigned s)
+{
+        if (bi_print_dest_index(fp, ins, index))
+                return;
+
+        if (index & BIR_INDEX_UNIFORM)
+                fprintf(fp, "u%u", index & ~BIR_INDEX_UNIFORM);
+        else if (index & BIR_INDEX_CONSTANT)
+                fprintf(fp, "#0x%" PRIx64, bi_get_immediate(ins, s));
+        else if (index & BIR_INDEX_ZERO)
+                fprintf(fp, "#0");
+        else
+                fprintf(fp, "#err");
+}
+
 static void
 bi_print_src(FILE *fp, bi_instruction *ins, unsigned s)
 {
@@ -153,66 +207,23 @@ bi_print_src(FILE *fp, bi_instruction *ins, unsigned s)
         if (abs)
                 fprintf(fp, "abs(");
 
-        if (!src)
-                fprintf(fp, "_");
-        else if (src & BIR_INDEX_REGISTER)
-                fprintf(fp, "br%u", src & ~BIR_INDEX_REGISTER);
-        else if (src & BIR_INDEX_UNIFORM)
-                fprintf(fp, "u%u", src & ~BIR_INDEX_UNIFORM);
-        else if (src & BIR_INDEX_CONSTANT)
-                fprintf(fp, "#0x%" PRIx64, ins->constant.u64);
-        else if (src & BIR_INDEX_ZERO)
-                fprintf(fp, "#0");
-        else if (src & BIR_IS_REG)
-                fprintf(fp, "r%u", src >> 1);
-        else
-                fprintf(fp, "%u", (src >> 1) - 1);
+        if (ins->type == BI_BITWISE && ins->bitwise.src_invert[s])
+                fprintf(fp, "~");
+
+        bi_print_index(fp, ins, src, s);
 
         if (abs)
                 fprintf(fp, ")");
 }
 
-/* Prints a NIR ALU type in Bifrost-style ".f32" ".i8" etc */
-
 static void
-bi_print_alu_type(nir_alu_type t, FILE *fp)
+bi_print_swizzle(bi_instruction *ins, unsigned src, FILE *fp)
 {
-        unsigned size = nir_alu_type_get_type_size(t);
-        nir_alu_type base = nir_alu_type_get_base_type(t);
-
-        switch (base) {
-        case nir_type_int:
-                fprintf(fp, ".i");
-                break;
-        case nir_type_uint:
-                fprintf(fp, ".u");
-                break;
-        case nir_type_bool:
-                fprintf(fp, ".b");
-                break;
-        case nir_type_float:
-                fprintf(fp, ".f");
-                break;
-        default:
-                fprintf(fp, ".unknown");
-                break;
-        }
-
-        fprintf(fp, "%u", size);
-}
-
-static void
-bi_print_swizzle(bi_instruction *ins, FILE *fp)
-{
-        unsigned size = nir_alu_type_get_type_size(ins->dest_type);
-        unsigned count = 32 / size;
-        assert(size == 8 || size == 16);
-
         fprintf(fp, ".");
 
-        for (unsigned u = 0; u < count; ++u) {
-                assert(ins->swizzle[u] < size);
-                fputc("xyzw"[ins->swizzle[u]], fp);
+        for (unsigned u = 0; u < bi_get_component_count(ins, src); ++u) {
+                assert(ins->swizzle[src][u] < 4);
+                fputc("xyzw"[ins->swizzle[src][u]], fp);
         }
 }
 
@@ -227,19 +238,68 @@ bi_bitwise_op_name(enum bi_bitwise_op op)
         }
 }
 
-static void
-bi_print_load(struct bi_load *load, FILE *fp)
+static const char *
+bi_imath_op_name(enum bi_imath_op op)
 {
-        fprintf(fp, ".loc%u", load->location);
+        switch (op) {
+        case BI_IMATH_ADD: return "iadd";
+        case BI_IMATH_SUB: return "isub";
+        default: return "invalid";
+        }
+}
 
-        if (load->channels != 1)
-                fprintf(fp, ".v%u", load->channels);
+const char *
+bi_table_op_name(enum bi_table_op op)
+{
+        switch (op) {
+        case BI_TABLE_LOG2_U_OVER_U_1_LOW: return "log2.help";
+        default: return "invalid";
+        }
+}
+
+const char *
+bi_special_op_name(enum bi_special_op op)
+{
+        switch (op) {
+        case BI_SPECIAL_FRCP: return "frcp";
+        case BI_SPECIAL_FRSQ: return "frsq";
+        case BI_SPECIAL_EXP2_LOW: return "exp2_low";
+        default: return "invalid";
+        }
+}
+
+const char *
+bi_reduce_op_name(enum bi_reduce_op op)
+{
+        switch (op) {
+        case BI_REDUCE_ADD_FREXPM: return "add_frexpm";
+        default: return "invalid";
+        }
+}
+
+const char *
+bi_frexp_op_name(enum bi_frexp_op op)
+{
+        switch (op) {
+        case BI_FREXPE_LOG: return "frexpe_log";
+        default: return "invalid";
+        }
+}
+
+const char *
+bi_tex_op_name(enum bi_tex_op op)
+{
+        switch (op) {
+        case BI_TEX_NORMAL: return "normal";
+        case BI_TEX_COMPACT: return "compact";
+        case BI_TEX_DUAL: return "dual";
+        default: return "invalid";
+        }
 }
 
 static void
 bi_print_load_vary(struct bi_load_vary *load, FILE *fp)
 {
-        bi_print_load(&load->load, fp);
         fprintf(fp, "%s", bi_interp_mode_name(load->interp_mode));
 
         if (load->reuse)
@@ -249,25 +309,26 @@ bi_print_load_vary(struct bi_load_vary *load, FILE *fp)
                 fprintf(fp, ".flat");
 }
 
-static const char *
+const char *
 bi_cond_name(enum bi_cond cond)
 {
         switch (cond) {
-        case BI_COND_ALWAYS: return ".always";
-        case BI_COND_LT: return ".lt";
-        case BI_COND_LE: return ".le";
-        case BI_COND_GE: return ".ge";
-        case BI_COND_GT: return ".gt";
-        case BI_COND_EQ: return ".eq";
-        case BI_COND_NE: return ".ne";
+        case BI_COND_ALWAYS: return "always";
+        case BI_COND_LT: return "lt";
+        case BI_COND_LE: return "le";
+        case BI_COND_GE: return "ge";
+        case BI_COND_GT: return "gt";
+        case BI_COND_EQ: return "eq";
+        case BI_COND_NE: return "ne";
         default: return "invalid";
         }
 }
 
 static void
-bi_print_branch(struct bi_branch *branch, FILE *fp)
+bi_print_texture(struct bi_texture *tex, FILE *fp)
 {
-        fprintf(fp, "%s", bi_cond_name(branch->cond));
+        fprintf(fp, " - texture %u, sampler %u",
+                        tex->texture_index, tex->sampler_index);
 }
 
 void
@@ -277,24 +338,41 @@ bi_print_instruction(bi_instruction *ins, FILE *fp)
                 fprintf(fp, "%s", ins->op.minmax == BI_MINMAX_MIN ? "min" : "max");
         else if (ins->type == BI_BITWISE)
                 fprintf(fp, "%s", bi_bitwise_op_name(ins->op.bitwise));
-        else if (ins->type == BI_ROUND)
-                fprintf(fp, ins->op.round == BI_ROUND_MODE ? "roundMode": "round");
+        else if (ins->type == BI_IMATH)
+                fprintf(fp, "%s", bi_imath_op_name(ins->op.imath));
+        else if (ins->type == BI_SPECIAL)
+                fprintf(fp, "%s", bi_special_op_name(ins->op.special));
+        else if (ins->type == BI_TABLE)
+                fprintf(fp, "%s", bi_table_op_name(ins->op.table));
+        else if (ins->type == BI_REDUCE_FMA)
+                fprintf(fp, "%s", bi_reduce_op_name(ins->op.reduce));
+        else if (ins->type == BI_FREXP)
+                fprintf(fp, "%s", bi_frexp_op_name(ins->op.frexp));
         else
                 fprintf(fp, "%s", bi_class_name(ins->type));
 
+        if ((ins->type == BI_ADD || ins->type == BI_FMA) && ins->op.mscale)
+                fprintf(fp, ".mscale");
+
         if (ins->type == BI_MINMAX)
                 fprintf(fp, "%s", bi_minmax_mode_name(ins->minmax));
-        else if (ins->type == BI_LOAD_ATTR || ins->type == BI_LOAD_VAR_ADDRESS)
-                bi_print_load(&ins->load, fp);
         else if (ins->type == BI_LOAD_VAR)
                 bi_print_load_vary(&ins->load_vary, fp);
-        else if (ins->type == BI_BRANCH)
-                bi_print_branch(&ins->branch, fp);
-        else if (ins->type == BI_CSEL)
-                fprintf(fp, "%s", bi_cond_name(ins->csel_cond));
+        else if (ins->type == BI_BLEND)
+                fprintf(fp, ".loc%u", ins->blend_location);
+        else if (ins->type == BI_TEX) {
+                fprintf(fp, ".%s", bi_tex_op_name(ins->op.texture));
+        } else if (ins->type == BI_BITWISE)
+                fprintf(fp, ".%cshift", ins->bitwise.rshift ? 'r' : 'l');
+
+        if (bi_class_props[ins->type] & BI_CONDITIONAL)
+                fprintf(fp, ".%s", bi_cond_name(ins->cond));
+
+        if (ins->vector_channels)
+                fprintf(fp, ".v%u", ins->vector_channels);
 
         if (ins->dest)
-                bi_print_alu_type(ins->dest_type, fp);
+                pan_print_alu_type(ins->dest_type, fp);
 
         if (bi_has_outmod(ins))
                 fprintf(fp, "%s", bi_output_mod_name(ins->outmod));
@@ -303,32 +381,57 @@ bi_print_instruction(bi_instruction *ins, FILE *fp)
                 fprintf(fp, "%s", bi_round_mode_name(ins->roundmode));
 
         fprintf(fp, " ");
+        bool succ = bi_print_dest_index(fp, ins, ins->dest);
+        assert(succ);
 
-        if (ins->dest)
-                fprintf(fp, "%d", ins->dest);
-        else
-                fprintf(fp, "_");
+        if (ins->dest_offset)
+                fprintf(fp, "+%u", ins->dest_offset);
 
         fprintf(fp, ", ");
 
         bi_foreach_src(ins, s) {
                 bi_print_src(fp, ins, s);
 
-                if (bi_is_src_swizzled(ins, s))
-                        bi_print_swizzle(ins, fp);
-
-                if (ins->type == BI_CONVERT && s == 0)
-                        bi_print_alu_type(ins->src_types[s], fp);
-                else if ((ins->type == BI_BRANCH || ins->type == BI_CSEL) && s < 2)
-                        bi_print_alu_type(ins->src_types[s], fp);
+                if (ins->src[s] && !(ins->src[s] & (BIR_INDEX_CONSTANT | BIR_INDEX_ZERO))) {
+                        pan_print_alu_type(ins->src_types[s], fp);
+                        bi_print_swizzle(ins, s, fp);
+                }
 
                 if (s < BIR_SRC_COUNT)
                         fprintf(fp, ", ");
         }
 
+        if (ins->type == BI_BRANCH) {
+                assert(ins->branch_target);
+                fprintf(fp, "-> block%u", ins->branch_target->base.name);
+        } else if (ins->type == BI_TEX) {
+                bi_print_texture(&ins->texture, fp);
+        }
+
         fprintf(fp, "\n");
 }
 
+void
+bi_print_ports(bi_registers *regs, FILE *fp)
+{
+        for (unsigned i = 0; i < 2; ++i) {
+                if (regs->enabled[i])
+                        fprintf(fp, "port %u: %u\n", i, regs->port[i]);
+        }
+
+        if (regs->write_fma || regs->write_add) {
+                fprintf(fp, "port 2 (%s): %u\n",
+                                regs->write_add ? "ADD" : "FMA",
+                                regs->port[2]);
+        }
+
+        if ((regs->write_fma && regs->write_add) || regs->read_port3) {
+                fprintf(fp, "port 3 (%s): %u\n",
+                                regs->read_port3 ? "read" : "FMA",
+                                regs->port[3]);
+        }
+}
+
 void
 bi_print_bundle(bi_bundle *bundle, FILE *fp)
 {
@@ -348,7 +451,7 @@ bi_print_clause(bi_clause *clause, FILE *fp)
         fprintf(fp, "\tid(%u)", clause->scoreboard_id);
 
         if (clause->dependencies) {
-                fprintf(fp, ", next-wait(");
+                fprintf(fp, ", wait(");
 
                 for (unsigned i = 0; i < 8; ++i) {
                         if (clause->dependencies & (1 << i))
@@ -389,7 +492,7 @@ bi_print_clause(bi_clause *clause, FILE *fp)
 void
 bi_print_block(bi_block *block, FILE *fp)
 {
-        fprintf(fp, "block%u {\n", block->name);
+        fprintf(fp, "block%u {\n", block->base.name);
 
         if (block->scheduled) {
                 bi_foreach_clause_in_block(block, clause)
@@ -401,20 +504,18 @@ bi_print_block(bi_block *block, FILE *fp)
 
         fprintf(fp, "}");
 
-        if (block->successors[0]) {
+        if (block->base.successors[0]) {
                 fprintf(fp, " -> ");
 
-                for (unsigned i = 0; i < ARRAY_SIZE(block->successors); ++i) {
-                        if (block->successors[i])
-                                fprintf(fp, "block%u ", block->successors[i]->name);
-                }
+                pan_foreach_successor((&block->base), succ)
+                        fprintf(fp, "block%u ", succ->name);
         }
 
-        if (block->predecessors->entries) {
+        if (block->base.predecessors->entries) {
                 fprintf(fp, " from");
 
                 bi_foreach_predecessor(block, pred)
-                        fprintf(fp, " block%u", pred->name);
+                        fprintf(fp, " block%u", pred->base.name);
         }
 
         fprintf(fp, "\n\n");
@@ -424,5 +525,5 @@ void
 bi_print_shader(bi_context *ctx, FILE *fp)
 {
         bi_foreach_block(ctx, block)
-                bi_print_block(block, fp);
+                bi_print_block((bi_block *) block, fp);
 }