freedreno/ir3: Fix assertion failures dumping CS high full regs.
authorEric Anholt <eric@anholt.net>
Fri, 14 Aug 2020 18:52:57 +0000 (11:52 -0700)
committerMarge Bot <eric+marge@anholt.net>
Wed, 19 Aug 2020 16:56:14 +0000 (16:56 +0000)
commita27823ef2cd617db8a57d6c1c645a220ac83ee21
treec6dcc946fffe8a8570eba12b779f874e0542f37a
parentce335dcb19297d04f3fb6ce0d290ff99130d09f7
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
src/freedreno/.gitlab-ci/reference/dEQP-VK.draw.indirect_draw.indexed.indirect_draw_count.triangle_list.log
src/freedreno/.gitlab-ci/reference/fd-clouds.log
src/freedreno/ir3/disasm-a3xx.c