NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pan/mdg: Allow ignoring move mode

Browse source 
Ensures we can gaurantee we'll pick something, which matters for
depth/stencil export.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Fixes: de41c4c103 ("pan/mdg: Prioritize non-moves on VADD/VLUT")
Tested-by: Icecream95 <ixn@keemail.me>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5782>
This commit is contained in:
Alyssa Rosenzweig 2020-07-03 09:20:44 -04:00 • committed by Marge Bot
parent af8fcfe620
commit d624118cc9
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/panfrost/midgard/midgard_schedule.c
View file

@ -341,9 +341,9 @@ struct midgard_predicate {
unsigned no_mask;
unsigned dest;
/* For VADD/VLUT whether to only/never schedule imov/fmov instructions
* This allows non-move instructions to get priority on each unit */
bool moves;
/* Whether to not-care/only/never schedule imov/fmov instructions This
* allows non-move instructions to get priority on each unit */
unsigned move_mode;
/* For load/store: how many pipeline registers are in use? The two
* scheduled instructions cannot use more than the 256-bits of pipeline
@ -673,7 +673,8 @@ mir_choose_instruction(
if (alu && !branch && !(mir_has_unit(instructions[i], unit)))
continue;
if ((unit == UNIT_VLUT || unit == UNIT_VADD) && (predicate->moves != is_move))
/* 0: don't care, 1: no moves, 2: only moves */
if (predicate->move_mode && ((predicate->move_mode - 1) != is_move))
continue;
if (branch && !instructions[i]->compact_branch)
@ -1189,14 +1190,17 @@ mir_schedule_alu(
mir_choose_alu(&smul, instructions, liveness, worklist, len, &predicate, UNIT_SMUL);
for (unsigned moves = 0; moves < 2; ++moves) {
predicate.moves = moves;
for (unsigned mode = 1; mode < 3; ++mode) {
predicate.move_mode = mode;
predicate.no_mask = writeout ? (1 << 3) : 0;
mir_choose_alu(&vlut, instructions, liveness, worklist, len, &predicate, UNIT_VLUT);
predicate.no_mask = 0;
mir_choose_alu(&vadd, instructions, liveness, worklist, len, &predicate, UNIT_VADD);
}
/* Reset */
predicate.move_mode = 0;
mir_update_worklist(worklist, len, instructions, vlut);
mir_update_worklist(worklist, len, instructions, vadd);
mir_update_worklist(worklist, len, instructions, smul);