Mesa (master): freedreno/ir3: Fix assertion failures dumping CS high full regs.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a27823ef2cd617db8a57d6c1c645a220ac83ee21
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a27823ef2cd617db8a57d6c1c645a220ac83ee21

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 14 11:52:57 2020 -0700

freedreno/ir3: Fix assertion failures dumping CS high full regs.

The *2 here would bump into the *2 in regset, causing assertion failures
dumping CS programs.  Just set the mergedregs flag on a6xx, and don't
duplicate the mergedregs logic.  If you're dealing with new HW where we
don't know if mergedregs is set, you may need to tweak the flag during
disasm setup for the stats to make sense.

Fixes: f7bd3456d79a ("freedreno: deduplicate a3xx+ disasm")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6323>

---

 src/freedreno/.gitlab-ci/reference/crash.log       | 1029 +++++++++++++++++++-
 ...w.indexed.indirect_draw_count.triangle_list.log |   42 +-
 src/freedreno/.gitlab-ci/reference/fd-clouds.log   |   27 +-
 src/freedreno/ir3/disasm-a3xx.c                    |   27 +-
 4 files changed, 1057 insertions(+), 68 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=a27823ef2cd617db8a57d6c1c645a220ac83ee21