fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Pass flow_control through directly

Browse source 
More than just a single bool!

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7081>
This commit is contained in:
Alyssa Rosenzweig 2020-10-02 15:13:29 -04:00
parent 0f181f4eae
commit a22779866a
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/panfrost/bifrost/bi_pack.c
View file

@ -47,7 +47,7 @@ bi_pack_header(bi_clause *clause, bi_clause *next_1, bi_clause *next_2, bool is_
struct bifrost_header header = {
.flow_control =
(next_1 == NULL) ? BIFROST_FLOW_END :
(clause->back_to_back ? BIFROST_FLOW_NBTB : BIFROST_FLOW_NBTB_UNCONDITIONAL),
clause->flow_control,
.terminate_discarded_threads = is_fragment,
.next_clause_prefetch = clause->next_clause_prefetch,
.staging_barrier = clause->staging_barrier,

3
src/panfrost/bifrost/bi_print.c
View file

@ -409,8 +409,7 @@ bi_print_clause(bi_clause *clause, FILE *fp)
fprintf(fp, ")");
}
if (!clause->back_to_back)
fprintf(fp, " nbb");
fprintf(fp, " %s", bi_flow_control_name(clause->flow_control));
if (!clause->next_clause_prefetch)
fprintf(fp, " no_prefetch");

5
src/panfrost/bifrost/bi_schedule.c
View file

@ -221,7 +221,7 @@ bi_schedule(bi_context *ctx)
last_id = u->scoreboard_id;
/* Let's be optimistic, we'll fix up later */
u->back_to_back = true;
u->flow_control = BIFROST_FLOW_NBTB;
u->constant_count = 1;
u->constants[0] = ins->constant.u64;
@ -246,7 +246,8 @@ bi_schedule(bi_context *ctx)
if (!list_is_empty(&bblock->clauses)) {
bi_clause *last_clause = list_last_entry(&bblock->clauses, bi_clause, link);
last_clause->back_to_back = bi_back_to_back(bblock);
if (!bi_back_to_back(bblock))
last_clause->flow_control = BIFROST_FLOW_NBTB_UNCONDITIONAL;
}
bblock->scheduled = true;

7
src/panfrost/bifrost/compiler.h
View file

@ -395,11 +395,8 @@ typedef struct {
unsigned scoreboard_id;
uint8_t dependencies;
/* Back-to-back corresponds directly to the back-to-back bit. Branch
* conditional corresponds to the branch conditional bit except that in
* the emitted code it's always set if back-to-bit is, whereas we use
* the actual value (without back-to-back so to speak) internally */
bool back_to_back;
/* See ISA header for description */
enum bifrost_flow flow_control;
/* Can we prefetch the next clause? Usually it makes sense, except for
* clauses ending in unconditional branches */