From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 20 Mar 2020 01:45:18 +0000 (-0400)
Subject: pan/bi: Pack a constant quadword
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb590a98d2bc29e6b3fb0792d804d76904af6603;p=mesa.git

pan/bi: Pack a constant quadword

The piping isn't there to make use of it yet, but this stubs out
constant support at the clause level.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4276>
---

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 16a1266b5a8..56181241bcf 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -315,6 +315,8 @@ bi_get_src(bi_instruction *ins, struct bi_registers *regs, unsigned s, bool is_f
                 return bi_get_src_const(regs, 0);
         else if (src & BIR_INDEX_PASS)
                 return src & ~BIR_INDEX_PASS;
+        else if (src & BIR_INDEX_CONSTANT)
+                return bi_get_src_const(regs, 0); /*TODO ins->constant.u64 */
         else
                 unreachable("Unknown src");
 }
@@ -550,6 +552,33 @@ bi_pack_bundle(bi_clause *clause, bi_bundle bundle, bi_bundle prev, bool first_b
         return packed;
 }
 
+/* Packs the next two constants as a dedicated constant quadword at the end of
+ * the clause, returning the number packed. */
+
+static unsigned
+bi_pack_constants(bi_context *ctx, bi_clause *clause,
+                unsigned index,
+                struct util_dynarray *emission)
+{
+        /* After these two, are we done? Determines tag */
+        bool done = clause->constant_count <= (index + 2);
+        bool only = clause->constant_count <= (index + 1);
+
+        /* TODO: Pos */
+        assert(index == 0 && clause->bundle_count == 1);
+
+        struct bifrost_fmt_constant quad = {
+                .pos = 0, /* TODO */
+                .tag = done ? BIFROST_FMTC_FINAL : BIFROST_FMTC_CONSTANTS,
+                .imm_1 = clause->constants[index + 0] >> 4,
+                .imm_2 = only ? 0 : clause->constants[index + 1] >> 4
+        };
+
+        util_dynarray_append(emission, struct bifrost_fmt_constant, quad);
+
+        return 2;
+}
+
 static void
 bi_pack_clause(bi_context *ctx, bi_clause *clause, bi_clause *next,
                 struct util_dynarray *emission)
@@ -560,8 +589,11 @@ bi_pack_clause(bi_context *ctx, bi_clause *clause, bi_clause *next,
         /* Used to decide if we elide writes */
         bool is_fragment = ctx->stage == MESA_SHADER_FRAGMENT;
 
+        /* State for packing constants throughout */
+        unsigned constant_index = 0;
+
         struct bifrost_fmt1 quad_1 = {
-                .tag = BIFROST_FMT1_FINAL,
+                .tag = clause->constant_count ? BIFROST_FMT1_CONSTANTS : BIFROST_FMT1_FINAL,
                 .header = bi_pack_header(clause, next, is_fragment),
                 .ins_1 = ins_1.lo,
                 .ins_2 = ins_1.hi & ((1 << 11) - 1),
@@ -569,6 +601,13 @@ bi_pack_clause(bi_context *ctx, bi_clause *clause, bi_clause *next,
         };
 
         util_dynarray_append(emission, struct bifrost_fmt1, quad_1);
+
+        /* Pack the remaining constants */
+
+        while (constant_index < clause->constant_count) {
+                constant_index += bi_pack_constants(ctx, clause,
+                                constant_index, emission);
+        }
 }
 
 static bi_clause *
diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index 5ec8c495465..b99115796d6 100644
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -403,6 +403,16 @@ struct bifrost_fmt1 {
 #define BIFROST_FMT1_FINAL           0b01001
 #define BIFROST_FMT1_CONSTANTS       0b00001
 
+#define BIFROST_FMTC_CONSTANTS       0b0011
+#define BIFROST_FMTC_FINAL           0b0111
+
+struct bifrost_fmt_constant {
+        unsigned pos : 4;
+        unsigned tag : 4;
+        uint64_t imm_1 : 60;
+        uint64_t imm_2 : 60;
+} __attribute__((packed));
+
 enum bifrost_reg_control {
         BIFROST_WRITE_FMA_P2         = 1,
         BIFROST_WRITE_FMA_P2_READ_P3 = 2,