pan/bi: Add branch constant field to IR

The offsets used for branches need some extra bits twiddled, so add a
field to the clause to indicate this is happening. This is not ambiguous
since a clause can only have a single branch.

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

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index 681075c6c7eb7b3e560a3363ce3372b3aa06512d..7b8164e4f43367d8f7640512676e6697450c25ca 100644 (file)
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -479,6 +479,9 @@ bi_print_clause(bi_clause *clause, FILE *fp)
                 for (unsigned i = 0; i < clause->constant_count; ++i)
                         fprintf(fp, "%" PRIx64 " ", clause->constants[i]);
 
+                if (clause->branch_constant)
+                        fprintf(fp, "*");
+
                 fprintf(fp, "\n");
         }
 }

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index b1f7887e58706de036dc8008f5aab03a61a9921d..fb95c6d83df8350153feda0a3b1f0ade45210f65 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -376,6 +376,12 @@ typedef struct {
         uint64_t constants[8];
         unsigned constant_count;
 
+        /* Branches encode a constant offset relative to the program counter
+         * with some magic flags. By convention, if there is a branch, its
+         * constant will be last. Set this flag to indicate this is required.
+         */
+        bool branch_constant;
+
         /* What type of high latency instruction is here, basically */
         unsigned clause_type;
 } bi_clause;