From 9efdbb2af475ac119f5e5bb1eb128d842ee52998 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sat, 29 Aug 2020 19:23:19 +0300 Subject: [PATCH] anv: fix robust buffer access In 957bbc6ad907ec we merged all the per stages allocations of push constants into a single one. Unfortunately one field remained per stage. This fixes the issue by including all the per stage values of the masked registers for robust buffer access into the push constant data. v2: Drop unneeded loop (Jason) Signed-off-by: Lionel Landwerlin Fixes: 957bbc6ad907ec ("anv: simplify push constant emissions") Reviewed-by: Jason Ekstrand Part-of: --- .../vulkan/anv_nir_compute_push_layout.c | 4 +- src/intel/vulkan/anv_private.h | 3 +- src/intel/vulkan/genX_cmd_buffer.c | 69 +++++++++++-------- 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/intel/vulkan/anv_nir_compute_push_layout.c b/src/intel/vulkan/anv_nir_compute_push_layout.c index 9fcc2f74e22..90887c08674 100644 --- a/src/intel/vulkan/anv_nir_compute_push_layout.c +++ b/src/intel/vulkan/anv_nir_compute_push_layout.c @@ -85,7 +85,7 @@ anv_nir_compute_push_layout(const struct anv_physical_device *pdevice, * the shader. */ const uint32_t push_reg_mask_start = - offsetof(struct anv_push_constants, push_reg_mask); + offsetof(struct anv_push_constants, push_reg_mask[nir->info.stage]); const uint32_t push_reg_mask_end = push_reg_mask_start + sizeof(uint64_t); push_start = MIN2(push_start, push_reg_mask_start); push_end = MAX2(push_end, push_reg_mask_end); @@ -172,7 +172,7 @@ anv_nir_compute_push_layout(const struct anv_physical_device *pdevice, if (robust_buffer_access) { const uint32_t push_reg_mask_offset = - offsetof(struct anv_push_constants, push_reg_mask); + offsetof(struct anv_push_constants, push_reg_mask[nir->info.stage]); assert(push_reg_mask_offset >= push_start); prog_data->push_reg_mask_param = (push_reg_mask_offset - push_start) / 4; diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index eb18b147fc4..e4a7aa3a6eb 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -2628,7 +2628,8 @@ struct anv_push_constants { /** Dynamic offsets for dynamic UBOs and SSBOs */ uint32_t dynamic_offsets[MAX_DYNAMIC_BUFFERS]; - uint64_t push_reg_mask; + /* Robust access pushed registers. */ + uint64_t push_reg_mask[MESA_SHADER_STAGES]; /** Pad out to a multiple of 32 bytes */ uint32_t pad[2]; diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 0b9569b54b5..d65da902ce8 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3169,6 +3169,45 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer, uint32_t nobuffer_stages = 0; #endif + /* Compute robust pushed register access mask for each stage. */ + if (cmd_buffer->device->robust_buffer_access) { + anv_foreach_stage(stage, dirty_stages) { + if (!anv_pipeline_has_stage(pipeline, stage)) + continue; + + const struct anv_pipeline_bind_map *bind_map = + &pipeline->shaders[stage]->bind_map; + struct anv_push_constants *push = &gfx_state->base.push_constants; + + push->push_reg_mask[stage] = 0; + /* Start of the current range in the shader, relative to the start of + * push constants in the shader. + */ + unsigned range_start_reg = 0; + for (unsigned i = 0; i < 4; i++) { + const struct anv_push_range *range = &bind_map->push_ranges[i]; + if (range->length == 0) + continue; + + unsigned bound_size = + get_push_range_bound_size(cmd_buffer, stage, range); + if (bound_size >= range->start * 32) { + unsigned bound_regs = + MIN2(DIV_ROUND_UP(bound_size, 32) - range->start, + range->length); + assert(range_start_reg + bound_regs <= 64); + push->push_reg_mask[stage] |= BITFIELD64_RANGE(range_start_reg, + bound_regs); + } + + cmd_buffer->state.push_constants_dirty |= + mesa_to_vk_shader_stage(stage); + + range_start_reg += range->length; + } + } + } + /* Resets the push constant state so that we allocate a new one if * needed. */ @@ -3183,36 +3222,6 @@ cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer, if (anv_pipeline_has_stage(pipeline, stage)) { const struct anv_pipeline_bind_map *bind_map = &pipeline->shaders[stage]->bind_map; - struct anv_push_constants *push = &gfx_state->base.push_constants; - - if (cmd_buffer->device->robust_buffer_access) { - push->push_reg_mask = 0; - /* Start of the current range in the shader, relative to the start - * of push constants in the shader. - */ - unsigned range_start_reg = 0; - for (unsigned i = 0; i < 4; i++) { - const struct anv_push_range *range = &bind_map->push_ranges[i]; - if (range->length == 0) - continue; - - unsigned bound_size = - get_push_range_bound_size(cmd_buffer, stage, range); - if (bound_size >= range->start * 32) { - unsigned bound_regs = - MIN2(DIV_ROUND_UP(bound_size, 32) - range->start, - range->length); - assert(range_start_reg + bound_regs <= 64); - push->push_reg_mask |= BITFIELD64_RANGE(range_start_reg, - bound_regs); - } - - cmd_buffer->state.push_constants_dirty |= - mesa_to_vk_shader_stage(stage); - - range_start_reg += range->length; - } - } /* We have to gather buffer addresses as a second step because the * loop above puts data into the push constant area and the call to -- 2.30.2