KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alyssa Rosenzweig 2020-05-05 17:29:24 -04:00 committed by Marge Bot
parent 4096be05af
commit c3de28bb49
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/panfrost/bifrost/bi_print.c
View File

@ -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)

11
src/panfrost/bifrost/compiler.h
View File

@ -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