diff options
| author | Rob Clark <[email protected]> | 2020-03-10 16:01:30 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-16 20:56:15 +0000 |
| commit | cd376a143461a4ed16ebd58de046f89da4113ff7 (patch) | |
| tree | 9bfb8e95bbe2206548730bea751a13e12707f476 /src/freedreno/ir3 | |
| parent | 1418ea0d0015d6bf8a5256668f4485ae22ffbc0a (diff) | |
freedreno/ir3/legalize: don't allow (nopN) if (rptN)
These two encodings are mutually exclusive. If the instruction is a
vector(ish) `(rptN)` instruction, then we can't fold a `(nopN)` post-
delay into it.
Signed-off-by: Rob Clark <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5280>
Diffstat (limited to 'src/freedreno/ir3')
| -rw-r--r-- | src/freedreno/ir3/ir3_legalize.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/freedreno/ir3/ir3_legalize.c b/src/freedreno/ir3/ir3_legalize.c index c59c065c207..ce3d4fdebb8 100644 --- a/src/freedreno/ir3/ir3_legalize.c +++ b/src/freedreno/ir3/ir3_legalize.c @@ -681,7 +681,8 @@ nop_sched(struct ir3 *ir) */ if ((delay > 0) && (ir->compiler->gpu_id >= 600) && last && - ((opc_cat(last->opc) == 2) || (opc_cat(last->opc) == 3))) { + ((opc_cat(last->opc) == 2) || (opc_cat(last->opc) == 3)) && + (last->repeat == 0)) { /* the previous cat2/cat3 instruction can encode at most 3 nop's: */ unsigned transfer = MIN2(delay, 3 - last->nop); last->nop += transfer; |