From 8a0052f0999529263ad421e3b74b083c8b727c61 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 3 Nov 2021 16:51:49 +0100 Subject: [PATCH] radv/sqtt: always dump pipelines and shaders ISA Even if instruction timing is disabled, both features are unrelated. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/layers/radv_sqtt_layer.c | 38 +++++++++++-------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 0d628ee1af1..2213d9adc96 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -610,8 +610,7 @@ sqtt_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline API_MARKER(BindPipeline, commandBuffer, pipelineBindPoint, _pipeline); - if (radv_is_instruction_timing_enabled()) - radv_describe_pipeline_bind(cmd_buffer, pipelineBindPoint, pipeline); + radv_describe_pipeline_bind(cmd_buffer, pipelineBindPoint, pipeline); } VKAPI_ATTR void VKAPI_CALL @@ -994,17 +993,15 @@ sqtt_CreateGraphicsPipelines(VkDevice _device, VkPipelineCache pipelineCache, ui if (result != VK_SUCCESS) return result; - if (radv_is_instruction_timing_enabled()) { - for (unsigned i = 0; i < count; i++) { - RADV_FROM_HANDLE(radv_pipeline, pipeline, pPipelines[i]); + for (unsigned i = 0; i < count; i++) { + RADV_FROM_HANDLE(radv_pipeline, pipeline, pPipelines[i]); - if (!pipeline) - continue; + if (!pipeline) + continue; - result = radv_register_pipeline(device, pipeline); - if (result != VK_SUCCESS) - goto fail; - } + result = radv_register_pipeline(device, pipeline); + if (result != VK_SUCCESS) + goto fail; } return VK_SUCCESS; @@ -1030,17 +1027,15 @@ sqtt_CreateComputePipelines(VkDevice _device, VkPipelineCache pipelineCache, uin if (result != VK_SUCCESS) return result; - if (radv_is_instruction_timing_enabled()) { - for (unsigned i = 0; i < count; i++) { - RADV_FROM_HANDLE(radv_pipeline, pipeline, pPipelines[i]); + for (unsigned i = 0; i < count; i++) { + RADV_FROM_HANDLE(radv_pipeline, pipeline, pPipelines[i]); - if (!pipeline) - continue; + if (!pipeline) + continue; - result = radv_register_pipeline(device, pipeline); - if (result != VK_SUCCESS) - goto fail; - } + result = radv_register_pipeline(device, pipeline); + if (result != VK_SUCCESS) + goto fail; } return VK_SUCCESS; @@ -1063,8 +1058,7 @@ sqtt_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, if (!_pipeline) return; - if (radv_is_instruction_timing_enabled()) - radv_unregister_pipeline(device, pipeline); + radv_unregister_pipeline(device, pipeline); radv_DestroyPipeline(_device, _pipeline, pAllocator); }