From 88ffeb61ae6002b1e9d66707e8a8ad3834090ad9 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 10 Dec 2024 10:03:11 +0100 Subject: [PATCH] radv/meta: convert the copy/fill pipelines to vk_meta This also switches these pipelines to on-demand always. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meta/radv_meta.c | 5 - src/amd/vulkan/meta/radv_meta.h | 3 - src/amd/vulkan/meta/radv_meta_buffer.c | 148 +++++++++++-------------- src/amd/vulkan/radv_device.h | 7 -- 4 files changed, 63 insertions(+), 100 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c index ae669edd3d7..2a22c06f8b3 100644 --- a/src/amd/vulkan/meta/radv_meta.c +++ b/src/amd/vulkan/meta/radv_meta.c @@ -479,10 +479,6 @@ radv_device_init_meta(struct radv_device *device) if (result != VK_SUCCESS) return result; - result = radv_device_init_meta_buffer_state(device, on_demand); - if (result != VK_SUCCESS) - return result; - result = radv_device_init_meta_query_state(device, on_demand); if (result != VK_SUCCESS) return result; @@ -561,7 +557,6 @@ radv_device_finish_meta(struct radv_device *device) radv_device_finish_meta_bufimage_state(device); radv_device_finish_meta_depth_decomp_state(device); radv_device_finish_meta_query_state(device); - radv_device_finish_meta_buffer_state(device); radv_device_finish_meta_fast_clear_flush_state(device); radv_device_finish_meta_resolve_compute_state(device); radv_device_finish_meta_resolve_fragment_state(device); diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 983b382a5f2..e805b1b964c 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -123,9 +123,6 @@ void radv_device_finish_meta_blit_state(struct radv_device *device); VkResult radv_device_init_meta_blit2d_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_blit2d_state(struct radv_device *device); -VkResult radv_device_init_meta_buffer_state(struct radv_device *device, bool on_demand); -void radv_device_finish_meta_buffer_state(struct radv_device *device); - VkResult radv_device_init_meta_query_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_query_state(struct radv_device *device); diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 3215c19c353..9db54b01d9f 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/src/amd/vulkan/meta/radv_meta_buffer.c @@ -37,8 +37,9 @@ struct fill_constants { }; static VkResult -create_fill_pipeline(struct radv_device *device) +get_fill_pipeline(struct radv_device *device, VkPipeline *pipeline_out, VkPipelineLayout *layout_out) { + const char *key_data = "radv-fill-buffer"; VkResult result; const VkPushConstantRange pc_range = { @@ -46,36 +47,38 @@ create_fill_pipeline(struct radv_device *device) .size = sizeof(struct fill_constants), }; - result = radv_meta_create_pipeline_layout(device, NULL, 1, &pc_range, &device->meta_state.buffer.fill_p_layout); + result = vk_meta_get_pipeline_layout(&device->vk, &device->meta_state.device, NULL, &pc_range, key_data, + strlen(key_data), layout_out); if (result != VK_SUCCESS) return result; - nir_shader *cs = build_buffer_fill_shader(device); - - result = radv_meta_create_compute_pipeline(device, cs, device->meta_state.buffer.fill_p_layout, - &device->meta_state.buffer.fill_pipeline); - - ralloc_free(cs); - return result; -} - -static VkResult -get_fill_pipeline(struct radv_device *device, VkPipeline *pipeline_out) -{ - struct radv_meta_state *state = &device->meta_state; - VkResult result = VK_SUCCESS; - - mtx_lock(&state->mtx); - if (!state->buffer.fill_pipeline) { - result = create_fill_pipeline(device); - if (result != VK_SUCCESS) - goto fail; + VkPipeline pipeline_from_cache = vk_meta_lookup_pipeline(&device->meta_state.device, key_data, strlen(key_data)); + if (pipeline_from_cache != VK_NULL_HANDLE) { + *pipeline_out = pipeline_from_cache; + return VK_SUCCESS; } - *pipeline_out = state->buffer.fill_pipeline; + nir_shader *cs = build_buffer_fill_shader(device); -fail: - mtx_unlock(&state->mtx); + const VkPipelineShaderStageCreateInfo stage_info = { + .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, + .stage = VK_SHADER_STAGE_COMPUTE_BIT, + .module = vk_shader_module_handle_from_nir(cs), + .pName = "main", + .pSpecializationInfo = NULL, + }; + + const VkComputePipelineCreateInfo pipeline_info = { + .sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, + .stage = stage_info, + .flags = 0, + .layout = *layout_out, + }; + + result = vk_meta_create_compute_pipeline(&device->vk, &device->meta_state.device, &pipeline_info, key_data, + strlen(key_data), pipeline_out); + + ralloc_free(cs); return result; } @@ -109,8 +112,9 @@ struct copy_constants { }; static VkResult -create_copy_pipeline(struct radv_device *device) +get_copy_pipeline(struct radv_device *device, VkPipeline *pipeline_out, VkPipelineLayout *layout_out) { + const char *key_data = "radv-copy-buffer"; VkResult result; const VkPushConstantRange pc_range = { @@ -118,78 +122,51 @@ create_copy_pipeline(struct radv_device *device) .size = sizeof(struct copy_constants), }; - result = radv_meta_create_pipeline_layout(device, NULL, 1, &pc_range, &device->meta_state.buffer.copy_p_layout); + result = vk_meta_get_pipeline_layout(&device->vk, &device->meta_state.device, NULL, &pc_range, key_data, + strlen(key_data), layout_out); if (result != VK_SUCCESS) return result; + VkPipeline pipeline_from_cache = vk_meta_lookup_pipeline(&device->meta_state.device, key_data, strlen(key_data)); + if (pipeline_from_cache != VK_NULL_HANDLE) { + *pipeline_out = pipeline_from_cache; + return VK_SUCCESS; + } + nir_shader *cs = build_buffer_copy_shader(device); - result = radv_meta_create_compute_pipeline(device, cs, device->meta_state.buffer.copy_p_layout, - &device->meta_state.buffer.copy_pipeline); + const VkPipelineShaderStageCreateInfo stage_info = { + .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, + .stage = VK_SHADER_STAGE_COMPUTE_BIT, + .module = vk_shader_module_handle_from_nir(cs), + .pName = "main", + .pSpecializationInfo = NULL, + }; + + const VkComputePipelineCreateInfo pipeline_info = { + .sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, + .stage = stage_info, + .flags = 0, + .layout = *layout_out, + }; + + result = vk_meta_create_compute_pipeline(&device->vk, &device->meta_state.device, &pipeline_info, key_data, + strlen(key_data), pipeline_out); ralloc_free(cs); return result; } -static VkResult -get_copy_pipeline(struct radv_device *device, VkPipeline *pipeline_out) -{ - struct radv_meta_state *state = &device->meta_state; - VkResult result = VK_SUCCESS; - - mtx_lock(&state->mtx); - if (!state->buffer.copy_pipeline) { - result = create_copy_pipeline(device); - if (result != VK_SUCCESS) - goto fail; - } - - *pipeline_out = state->buffer.copy_pipeline; - -fail: - mtx_unlock(&state->mtx); - return result; -} - -VkResult -radv_device_init_meta_buffer_state(struct radv_device *device, bool on_demand) -{ - VkResult result; - - if (on_demand) - return VK_SUCCESS; - - result = create_fill_pipeline(device); - if (result != VK_SUCCESS) - return result; - - result = create_copy_pipeline(device); - if (result != VK_SUCCESS) - return result; - - return result; -} - -void -radv_device_finish_meta_buffer_state(struct radv_device *device) -{ - struct radv_meta_state *state = &device->meta_state; - - radv_DestroyPipeline(radv_device_to_handle(device), state->buffer.copy_pipeline, &state->alloc); - radv_DestroyPipeline(radv_device_to_handle(device), state->buffer.fill_pipeline, &state->alloc); - radv_DestroyPipelineLayout(radv_device_to_handle(device), state->buffer.copy_p_layout, &state->alloc); - radv_DestroyPipelineLayout(radv_device_to_handle(device), state->buffer.fill_p_layout, &state->alloc); -} - static void fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, uint32_t data) { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_meta_saved_state saved_state; + VkPipelineLayout layout; VkPipeline pipeline; VkResult result; - result = get_fill_pipeline(device, &pipeline); + result = get_fill_pipeline(device, &pipeline, &layout); if (result != VK_SUCCESS) { vk_command_buffer_set_error(&cmd_buffer->vk, result); return; @@ -207,8 +184,8 @@ fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t siz .data = data, }; - vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), device->meta_state.buffer.fill_p_layout, - VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(fill_consts), &fill_consts); + vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, + sizeof(fill_consts), &fill_consts); radv_unaligned_dispatch(cmd_buffer, DIV_ROUND_UP(size, 16), 1, 1); @@ -220,10 +197,11 @@ copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t { struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_meta_saved_state saved_state; + VkPipelineLayout layout; VkPipeline pipeline; VkResult result; - result = get_copy_pipeline(device, &pipeline); + result = get_copy_pipeline(device, &pipeline, &layout); if (result != VK_SUCCESS) { vk_command_buffer_set_error(&cmd_buffer->vk, result); return; @@ -241,8 +219,8 @@ copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t .max_offset = size - 16, }; - vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), device->meta_state.buffer.copy_p_layout, - VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(copy_consts), ©_consts); + vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, + sizeof(copy_consts), ©_consts); radv_unaligned_dispatch(cmd_buffer, DIV_ROUND_UP(size, 16), 1, 1); diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index 6ae588212c0..daf0bb90c74 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -273,13 +273,6 @@ struct radv_meta_state { VkPipeline dcc_decompress_compute_pipeline; } fast_clear_flush; - struct { - VkPipelineLayout fill_p_layout; - VkPipelineLayout copy_p_layout; - VkPipeline fill_pipeline; - VkPipeline copy_pipeline; - } buffer; - struct { VkDescriptorSetLayout ds_layout; VkPipelineLayout p_layout;