diff options
| author | Eric Anholt <eric@anholt.net> | 2018-08-01 16:37:08 -0700 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2018-08-07 20:52:48 +0300 |
| commit | cce78368dfbd83909b255b7556469103040ceb96 (patch) | |
| tree | 481b55d663e199fe7642b2220a06386c84c8a477 | |
| parent | b6e9ef15561f7b18ca7c8b56159c7038cdd34866 (diff) | |
v3d: Make sure we don't emit a thrsw before the last one finished.
Found while forcing some spilling, which creates a lot of short
tmua->thrsw->ldtmu sequences.
Cc: "18.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit ccbe33af5b086f4b488ac7ca8a8a45ebc9ac189c)
| -rw-r--r-- | src/broadcom/compiler/qpu_schedule.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/broadcom/compiler/qpu_schedule.c b/src/broadcom/compiler/qpu_schedule.c index fb5ecd6410c..4f3b621fd29 100644 --- a/src/broadcom/compiler/qpu_schedule.c +++ b/src/broadcom/compiler/qpu_schedule.c @@ -462,6 +462,7 @@ struct choose_scoreboard { int last_magic_sfu_write_tick; int last_ldvary_tick; int last_uniforms_reset_tick; + int last_thrsw_tick; bool tlb_locked; }; @@ -1095,10 +1096,16 @@ qpu_instruction_valid_in_thrend_slot(struct v3d_compile *c, } static bool -valid_thrsw_sequence(struct v3d_compile *c, +valid_thrsw_sequence(struct v3d_compile *c, struct choose_scoreboard *scoreboard, struct qinst *qinst, int instructions_in_sequence, bool is_thrend) { + /* No emitting our thrsw while the previous thrsw hasn't happened yet. */ + if (scoreboard->last_thrsw_tick + 3 > + scoreboard->tick - instructions_in_sequence) { + return false; + } + for (int slot = 0; slot < instructions_in_sequence; slot++) { /* No scheduling SFU when the result would land in the other * thread. The simulator complains for safety, though it @@ -1159,7 +1166,8 @@ emit_thrsw(struct v3d_compile *c, if (!v3d_qpu_sig_pack(c->devinfo, &sig, &packed_sig)) break; - if (!valid_thrsw_sequence(c, prev_inst, slots_filled + 1, + if (!valid_thrsw_sequence(c, scoreboard, + prev_inst, slots_filled + 1, is_thrend)) { break; } @@ -1173,7 +1181,9 @@ emit_thrsw(struct v3d_compile *c, if (merge_inst) { merge_inst->qpu.sig.thrsw = true; needs_free = true; + scoreboard->last_thrsw_tick = scoreboard->tick - slots_filled; } else { + scoreboard->last_thrsw_tick = scoreboard->tick; insert_scheduled_instruction(c, block, scoreboard, inst); time++; slots_filled++; @@ -1475,6 +1485,7 @@ v3d_qpu_schedule_instructions(struct v3d_compile *c) scoreboard.last_ldvary_tick = -10; scoreboard.last_magic_sfu_write_tick = -10; scoreboard.last_uniforms_reset_tick = -10; + scoreboard.last_thrsw_tick = -10; if (debug) { fprintf(stderr, "Pre-schedule instructions\n"); |