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

pan/bi: Fix 2-write pseudo op scheduling 

These cannot schedule to the last tuple, there needs to be other work in
the last clause, or a tuple of NOP's failing that. Can occur depending
on scheduling of CUBEFACE instructions, and will apply to computational
atomics in the near future.

Fixes: 77933d16d8 ("pan/bi: Switch to new scheduler")
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8962>
This commit is contained in:
Alyssa Rosenzweig 2021-02-09 19:46:40 -05:00 committed by Marge Bot
parent 214e7de909
commit 60cd7ff7f7
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/panfrost/bifrost/bi_schedule.c
View File

@ -306,6 +306,18 @@ bi_must_last(bi_instr *ins)
return bi_opcode_props[ins->op].last;
}
/* Architecturally, no single instruction has a "not last" constraint. However,
* pseudoinstructions writing multiple destinations (expanding to multiple
* paired instructions) can run afoul of the "no two writes on the last clause"
* constraint, so we check for that here.
*/
static bool
bi_must_not_last(bi_instr *ins)
{
return !bi_is_null(ins->dest[0]) && !bi_is_null(ins->dest[1]);
}
ASSERTED static bool
bi_must_message(bi_instr *ins)
{
@ -637,6 +649,9 @@ bi_instr_schedulable(bi_instr *instr,
if (bi_must_last(instr) && !tuple->last)
return false;
if (bi_must_not_last(instr) && tuple->last)
return false;
/* Message-passing instructions are not guaranteed write within the
* same clause (most likely they will not), so if a later instruction
* in the clause reads from the destination, the message-passing
@ -1226,11 +1241,19 @@ bi_schedule_clause(bi_context *ctx, bi_block *block, struct bi_worklist st)
BIFROST_SRC_STAGE, false);
}
if (tuple->add || tuple->fma)
clause->tuple_count++;
else
/* Don't add an empty tuple, unless the worklist has nothing
* but a (pseudo)instruction failing to schedule due to a "not
* last instruction" constraint */
int some_instruction = __bitset_ffs(st.worklist, BITSET_WORDS(st.count));
bool not_last = (some_instruction > 0) &&
bi_must_not_last(st.instructions[some_instruction - 1]);
if (!(tuple->fma || tuple->add || (tuple_state.last && not_last)))
break;
clause->tuple_count++;
/* Adding enough tuple might overflow constants */
if (!bi_space_for_more_constants(&clause_state))
break;