commit 64bedbfa67bc0f814ba6b0d4a587807fb9b88050
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Thu May 28 13:48:46 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Fri May 29 20:34:55 2020 +0000
tree c8e2d131f9a6ee9eed0540f28f154291b6113f5c
parent 9c329567508836b5b40cfbacf29a840e1e6d4c41

pan/bi: Link clauses back to their blocks

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

src/panfrost/bifrost/bi_schedule.c

diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/bifrost/bi_schedule.c
index f6652aa..47444b8 100644
--- a/src/panfrost/bifrost/bi_schedule.c
+++ b/src/panfrost/bifrost/bi_schedule.c
@@ -204,6 +204,7 @@
                                 u->branch_constant = true;
 
                         u->clause_type = bi_clause_type_for_ins(ins);
+                        u->block = (struct bi_block *) block;
 
                         list_addtail(&u->link, &bblock->clauses);
                 }

src/panfrost/bifrost/compiler.h

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index fb95c6d..a283f3f 100644
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -335,9 +335,14 @@
         bi_instruction *add;
 } bi_bundle;
 
+struct bi_block;
+
 typedef struct {
         struct list_head link;
 
+        /* Link back up for branch calculations */
+        struct bi_block *block;
+
         /* A clause can have 8 instructions in bundled FMA/ADD sense, so there
          * can be 8 bundles. */