pan/bi: Remove more artefacts of 2-pass scheduling

A clause is, by definition, already scheduled.

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 95b4e51fbecea345cdefe06c11068230319fce13..7a3d429767b7c0e4da675a75b2bf7b8bacaa0942 100644 (file)
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -469,17 +469,8 @@ bi_print_clause(bi_clause *clause, FILE *fp)
 
         fprintf(fp, "\n");
 
-        if (clause->instruction_count) {
-                assert(!clause->bundle_count);
-
-                for (unsigned i = 0; i < clause->instruction_count; ++i)
-                        bi_print_instruction(clause->instructions[i], fp);
-        } else {
-                assert(clause->bundle_count);
-
-                for (unsigned i = 0; i < clause->bundle_count; ++i)
-                        bi_print_bundle(&clause->bundles[i], fp);
-        }
+        for (unsigned i = 0; i < clause->bundle_count; ++i)
+                bi_print_bundle(&clause->bundles[i], fp);
 
         if (clause->constant_count) {
                 for (unsigned i = 0; i < clause->constant_count; ++i)

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index e4d37a8d52bc5bd16fd00a8c48fd259b252d697c..3ac958e51a917a4d37876743557541467de0d60b 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -339,17 +339,10 @@ typedef struct {
         struct list_head link;
 
         /* A clause can have 8 instructions in bundled FMA/ADD sense, so there
-         * can be 8 bundles. But each bundle can have both an FMA and an ADD,
-         * so a clause can have up to 16 bi_instructions. Whether bundles or
-         * instructions are used depends on where in scheduling we are. */
+         * can be 8 bundles. */
 
-        unsigned instruction_count;
         unsigned bundle_count;
-
-        union {
-                bi_instruction *instructions[16];
-                bi_bundle bundles[8];
-        };
+        bi_bundle bundles[8];
 
         /* For scoreboarding -- the clause ID (this is not globally unique!)
          * and its dependencies in terms of other clauses, computed during