diff options
| author | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2020-05-05 17:29:24 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-29 20:34:55 +0000 |
| commit | c3de28bb49229f195e2353d8bbaee63ff3198481 (patch) | |
| tree | 882f11f1376815ef7b739b5c3a083582822cff2c | |
| parent | 4096be05af306d18bf948f92ab03ee7d6f7468f4 (diff) | |
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>
| -rw-r--r-- | src/panfrost/bifrost/bi_print.c | 13 | ||||
| -rw-r--r-- | src/panfrost/bifrost/compiler.h | 11 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c index 95b4e51fbec..7a3d429767b 100644 --- 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 e4d37a8d52b..3ac958e51a9 100644 --- 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 |