pan/bi: Emit load_vary ops

[mesa.git] / src / panfrost / bifrost / bi_pack.c

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index beddb3f4314bcf4424d36b6c70aad84bc4ba7f9f..377990f83be9c3ba90f0d05d2e560bf28281935d 100644 (file)
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -259,18 +259,43 @@ bi_get_src_reg_port(struct bi_registers *regs, unsigned src)
 }
 
 static enum bifrost_packed_src
-bi_get_fma_src(bi_instruction *ins, struct bi_registers *regs, unsigned s)
+bi_get_src_const(struct bi_registers *regs, unsigned constant)
+{
+        if (regs->uniform_constant & (1 << 7))
+                unreachable("Tried to get constant but loading uniforms");
+
+        unsigned loc = (regs->uniform_constant >> 4) & 0x7;
+
+        if (loc != 0)
+                unreachable("TODO: constants in clauses");
+
+        unsigned lo = regs->uniform_constant & 0xF;
+
+        if (lo == 0) {
+                if (constant != 0)
+                        unreachable("Tried to load !0 in 0 slot");
+
+                return BIFROST_SRC_CONST_LO;
+        } else {
+                unreachable("Special slot is not a fixed immediate");
+        }
+}
+
+static enum bifrost_packed_src
+bi_get_src(bi_instruction *ins, struct bi_registers *regs, unsigned s, bool is_fma)
 {
         unsigned src = ins->src[s];
 
         if (src & BIR_INDEX_REGISTER)
                 return bi_get_src_reg_port(regs, src);
-        else if (src & BIR_INDEX_ZERO)
+        else if (src & BIR_INDEX_ZERO && is_fma)
                 return BIFROST_SRC_STAGE;
+        else if (src & BIR_INDEX_ZERO)
+                return bi_get_src_const(regs, 0);
         else if (src & BIR_INDEX_PASS)
                 return src & ~BIR_INDEX_PASS;
         else
-                unreachable("Unknown src in FMA");
+                unreachable("Unknown src");
 }
 
 static unsigned
@@ -280,9 +305,9 @@ bi_pack_fma_fma(bi_instruction *ins, struct bi_registers *regs)
         bool negate_mul = ins->src_neg[0] ^ ins->src_neg[1];
 
         struct bifrost_fma_fma pack = {
-                .src0 = bi_get_fma_src(ins, regs, 0),
-                .src1 = bi_get_fma_src(ins, regs, 1),
-                .src2 = bi_get_fma_src(ins, regs, 2),
+                .src0 = bi_get_src(ins, regs, 0, true),
+                .src1 = bi_get_src(ins, regs, 1, true),
+                .src2 = bi_get_src(ins, regs, 2, true),
                 .src0_abs = ins->src_abs[0],
                 .src1_abs = ins->src_abs[1],
                 .src2_abs = ins->src_abs[2],
@@ -294,6 +319,28 @@ bi_pack_fma_fma(bi_instruction *ins, struct bi_registers *regs)
         RETURN_PACKED(pack);
 }
 
+static unsigned
+bi_pack_fma_add(bi_instruction *ins, struct bi_registers *regs)
+{
+        /* TODO: fadd16 packing is a bit different */
+        assert(ins->dest_type == nir_type_float32);
+
+        struct bifrost_fma_add pack = {
+                .src0 = bi_get_src(ins, regs, 0, true),
+                .src1 = bi_get_src(ins, regs, 1, true),
+                .src0_abs = ins->src_abs[0],
+                .src1_abs = ins->src_abs[1],
+                .src0_neg = ins->src_neg[0],
+                .src1_neg = ins->src_neg[1],
+                .unk = 0x0,
+                .outmod = ins->outmod,
+                .roundmode = ins->roundmode,
+                .op = BIFROST_FMA_OP_FADD32
+        };
+
+        RETURN_PACKED(pack);
+}
+
 static unsigned
 bi_pack_fma(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
 {
@@ -302,6 +349,7 @@ bi_pack_fma(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
 
         switch (bundle.fma->type) {
         case BI_ADD:
+                return bi_pack_fma_add(bundle.fma, regs);
         case BI_CMP:
         case BI_BITWISE:
         case BI_CONVERT:
@@ -322,11 +370,83 @@ bi_pack_fma(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
         }
 }
 
+static unsigned
+bi_pack_add_ld_vary(bi_instruction *ins, struct bi_registers *regs)
+{
+        unsigned size = nir_alu_type_get_type_size(ins->dest_type);
+        assert(size == 32 || size == 16);
+
+        unsigned op = (size == 32) ?
+                BIFROST_ADD_OP_LD_VAR_32 :
+                BIFROST_ADD_OP_LD_VAR_16;
+
+        unsigned cmask = bi_from_bytemask(ins->writemask, size / 8);
+        unsigned channels = util_bitcount(cmask);
+        assert(cmask == ((1 << channels) - 1));
+
+        unsigned packed_addr = 0;
+
+        if (ins->src[0] & BIR_INDEX_CONSTANT) {
+                /* Direct uses address field directly */
+                packed_addr = ins->src[0] & ~BIR_INDEX_CONSTANT;
+                assert(packed_addr < 0b1000);
+        } else {
+                /* Indirect gets an extra source */
+                packed_addr = bi_get_src(ins, regs, 0, false) | 0b11000;
+        }
+
+        assert(channels >= 1 && channels <= 4);
+
+        struct bifrost_ld_var pack = {
+                .src0 = bi_get_src(ins, regs, 1, false),
+                .addr = packed_addr,
+                .channels = MALI_POSITIVE(channels),
+                .interp_mode = ins->load_vary.interp_mode,
+                .reuse = ins->load_vary.reuse,
+                .flat = ins->load_vary.flat,
+                .op = op
+        };
+
+        RETURN_PACKED(pack);
+}
+
 static unsigned
 bi_pack_add(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
 {
-        /* TODO */
-        return BIFROST_ADD_NOP;
+        if (!bundle.add)
+                return BIFROST_ADD_NOP;
+
+        switch (bundle.add->type) {
+        case BI_ADD:
+        case BI_ATEST:
+        case BI_BRANCH:
+        case BI_CMP:
+        case BI_BLEND:
+        case BI_BITWISE:
+        case BI_CONVERT:
+        case BI_DISCARD:
+        case BI_FREXP:
+        case BI_ISUB:
+        case BI_LOAD:
+        case BI_LOAD_UNIFORM:
+        case BI_LOAD_ATTR:
+                return BIFROST_ADD_NOP;
+        case BI_LOAD_VAR:
+                return bi_pack_add_ld_vary(bundle.add, regs);
+        case BI_LOAD_VAR_ADDRESS:
+        case BI_MINMAX:
+        case BI_MOV:
+        case BI_SHIFT:
+        case BI_STORE:
+        case BI_STORE_VAR:
+        case BI_SPECIAL:
+        case BI_SWIZZLE:
+        case BI_TEX:
+        case BI_ROUND:
+                return BIFROST_ADD_NOP;
+        default:
+                unreachable("Cannot encode class as ADD");
+        }
 }
 
 struct bi_packed_bundle {