OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Push at most 32 regs for vec4 shaders

Browse Source 
The vec4 back-end can't push UBOs just yet but it soon will be able.
When it starts pushing UBOs, it will have a lower limit than scalar due
to a crummy register allocator.  Mirror that limit in ANV so we don't
run into asserts due to ANV and the back-end making different choices.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10571>
This commit is contained in:
Jason Ekstrand
2021-05-03 23:08:42 -05:00
committed by Marge Bot
parent c01354d5c4
commit 7138249675
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/intel/vulkan/anv_nir_compute_push_layout.c
View File

@@ -154,17 +154,21 @@ anv_nir_compute_push_layout(const struct anv_physical_device *pdevice,
if (push_ubo_ranges) { if (push_ubo_ranges) {
brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges); brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges);
/* We can push at most 64 registers worth of data. The back-end /* The vec4 back-end pushes at most 32 regs while the scalar back-end
* compiler would do this fixup for us but we'd like to calculate * pushes up to 64. This is primarily because the scalar back-end has a
* the push constant layout ourselves. * massively more competent register allocator and so the risk of
* spilling due to UBO pushing isn't nearly as high.
*/ */
const unsigned max_push_regs =
compiler->scalar_stage[nir->info.stage] ? 64 : 32;
unsigned total_push_regs = push_constant_range.length; unsigned total_push_regs = push_constant_range.length;
for (unsigned i = 0; i < 4; i++) { for (unsigned i = 0; i < 4; i++) {
if (total_push_regs + prog_data->ubo_ranges[i].length > 64) if (total_push_regs + prog_data->ubo_ranges[i].length > max_push_regs)
prog_data->ubo_ranges[i].length = 64 - total_push_regs; prog_data->ubo_ranges[i].length = max_push_regs - total_push_regs;
total_push_regs += prog_data->ubo_ranges[i].length; total_push_regs += prog_data->ubo_ranges[i].length;
} }
assert(total_push_regs <= 64); assert(total_push_regs <= max_push_regs);
int n = 0; int n = 0;