From 1cd2a857d63a16df290a877fa6d46bbc34433207 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Wed, 14 May 2025 17:08:47 +0200 Subject: [PATCH] tu: Rename u_trace renderpass iterators They are not around renderpass but around draw_cs inside a renderpass. Signed-off-by: Danylo Piliaiev Part-of: --- src/freedreno/vulkan/tu_cmd_buffer.cc | 51 ++++++++++---------- src/freedreno/vulkan/tu_cmd_buffer.h | 6 +-- src/freedreno/vulkan/tu_device.cc | 8 +-- src/freedreno/vulkan/tu_dynamic_rendering.cc | 8 +-- 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index ebf8fe150aa..d9685163492 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -2537,8 +2537,8 @@ tu6_render_tile(struct tu_cmd_buffer *cmd, struct tu_cs *cs, tu_cs_emit_call(cs, &cmd->tile_store_cs); - tu_clone_trace_range(cmd, cs, cmd->trace_renderpass_start, - cmd->trace_renderpass_end); + tu_clone_trace_range(cmd, cs, cmd->trace_rp_drawcalls_start, + cmd->trace_rp_drawcalls_end); tu_cs_emit_wfi(cs); @@ -2893,7 +2893,7 @@ tu_cmd_render_tiles(struct tu_cmd_buffer *cmd, tu6_emit_tile_store(cmd, &cmd->tile_store_cs); tu_cs_end(&cmd->tile_store_cs); - cmd->trace_renderpass_end = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_end = u_trace_end_iterator(&cmd->trace); tu6_tile_render_begin(cmd, &cmd->cs, autotune_result, fdm_offsets); @@ -2959,9 +2959,9 @@ tu_cmd_render_tiles(struct tu_cmd_buffer *cmd, cmd->state.dirty |= TU_CMD_DIRTY_FDM; /* tu6_render_tile has cloned these tracepoints for each tile */ - if (!u_trace_iterator_equal(cmd->trace_renderpass_start, cmd->trace_renderpass_end)) - u_trace_disable_event_range(cmd->trace_renderpass_start, - cmd->trace_renderpass_end); + if (!u_trace_iterator_equal(cmd->trace_rp_drawcalls_start, cmd->trace_rp_drawcalls_end)) + u_trace_disable_event_range(cmd->trace_rp_drawcalls_start, + cmd->trace_rp_drawcalls_end); /* Reset the gmem store CS entry lists so that the next render pass * does its own stores. @@ -2974,7 +2974,7 @@ static void tu_cmd_render_sysmem(struct tu_cmd_buffer *cmd, struct tu_renderpass_result *autotune_result) { - cmd->trace_renderpass_end = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_end = u_trace_end_iterator(&cmd->trace); tu6_sysmem_render_begin(cmd, &cmd->cs, autotune_result); @@ -4936,8 +4936,8 @@ tu_append_pre_chain(struct tu_cmd_buffer *cmd, tu_render_pass_state_merge(&cmd->state.rp, &secondary->pre_chain.state); - tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->pre_chain.trace_renderpass_start, - secondary->pre_chain.trace_renderpass_end); + tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->pre_chain.trace_rp_drawcalls_start, + secondary->pre_chain.trace_rp_drawcalls_end); util_dynarray_append_dynarray(&cmd->fdm_bin_patchpoints, &secondary->pre_chain.fdm_bin_patchpoints); @@ -4958,8 +4958,8 @@ tu_append_post_chain(struct tu_cmd_buffer *cmd, tu_cs_add_entries(&cmd->draw_cs, &secondary->draw_cs); tu_cs_add_entries(&cmd->draw_epilogue_cs, &secondary->draw_epilogue_cs); - tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->trace_renderpass_start, - secondary->trace_renderpass_end); + tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->trace_rp_drawcalls_start, + secondary->trace_rp_drawcalls_end); cmd->state.rp = secondary->state.rp; util_dynarray_append_dynarray(&cmd->fdm_bin_patchpoints, &secondary->fdm_bin_patchpoints); @@ -4978,8 +4978,8 @@ tu_append_pre_post_chain(struct tu_cmd_buffer *cmd, tu_cs_add_entries(&cmd->draw_cs, &secondary->draw_cs); tu_cs_add_entries(&cmd->draw_epilogue_cs, &secondary->draw_epilogue_cs); - tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->trace_renderpass_start, - secondary->trace_renderpass_end); + tu_clone_trace_range(cmd, &cmd->draw_cs, secondary->trace_rp_drawcalls_start, + secondary->trace_rp_drawcalls_end); tu_render_pass_state_merge(&cmd->state.rp, &secondary->state.rp); util_dynarray_append_dynarray(&cmd->fdm_bin_patchpoints, @@ -4996,10 +4996,10 @@ tu_save_pre_chain(struct tu_cmd_buffer *cmd) &cmd->draw_cs); tu_cs_add_entries(&cmd->pre_chain.draw_epilogue_cs, &cmd->draw_epilogue_cs); - cmd->pre_chain.trace_renderpass_start = - cmd->trace_renderpass_start; - cmd->pre_chain.trace_renderpass_end = - cmd->trace_renderpass_end; + cmd->pre_chain.trace_rp_drawcalls_start = + cmd->trace_rp_drawcalls_start; + cmd->pre_chain.trace_rp_drawcalls_end = + cmd->trace_rp_drawcalls_end; cmd->pre_chain.state = cmd->state.rp; util_dynarray_append_dynarray(&cmd->pre_chain.fdm_bin_patchpoints, &cmd->fdm_bin_patchpoints); @@ -5080,7 +5080,7 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, */ if (cmd->state.suspend_resume == SR_NONE) { cmd->state.suspend_resume = SR_IN_PRE_CHAIN; - cmd->trace_renderpass_start = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_start = u_trace_end_iterator(&cmd->trace); } /* The secondary is just a continuous suspend/resume chain so we @@ -5100,7 +5100,7 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, */ if (cmd->state.suspend_resume == SR_NONE) - cmd->trace_renderpass_start = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_start = u_trace_end_iterator(&cmd->trace); tu_append_pre_chain(cmd, secondary); @@ -5118,7 +5118,7 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, * started in the primary, so we have to move the state to * `pre_chain`. */ - cmd->trace_renderpass_end = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_end = u_trace_end_iterator(&cmd->trace); tu_save_pre_chain(cmd); cmd->state.suspend_resume = SR_AFTER_PRE_CHAIN; break; @@ -5158,9 +5158,9 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, * pre-chain) that we need to copy into the current command * buffer. */ - cmd->trace_renderpass_start = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_start = u_trace_end_iterator(&cmd->trace); tu_append_post_chain(cmd, secondary); - cmd->trace_renderpass_end = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_end = u_trace_end_iterator(&cmd->trace); cmd->state.suspended_pass = secondary->state.suspended_pass; switch (cmd->state.suspend_resume) { @@ -5501,7 +5501,7 @@ tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, tu_lrz_begin_renderpass(cmd); - cmd->trace_renderpass_start = u_trace_end_iterator(&cmd->trace); + cmd->trace_rp_drawcalls_start = u_trace_end_iterator(&cmd->trace); tu_emit_renderpass_begin(cmd); tu_emit_subpass_begin(cmd); @@ -5648,7 +5648,8 @@ tu_CmdBeginRendering(VkCommandBuffer commandBuffer, tu_trace_start_render_pass(cmd); if (!resuming || cmd->state.suspend_resume == SR_NONE) { - cmd->trace_renderpass_start = u_trace_end_iterator(&cmd->trace); + tu_trace_start_render_pass(cmd); + cmd->trace_rp_drawcalls_start = u_trace_end_iterator(&cmd->trace); } if (!resuming) { @@ -7940,7 +7941,7 @@ tu_CmdEndRendering2EXT(VkCommandBuffer commandBuffer, tu_cs_end(&cmd_buffer->draw_epilogue_cs); if (cmd_buffer->state.suspend_resume == SR_IN_PRE_CHAIN) { - cmd_buffer->trace_renderpass_end = u_trace_end_iterator(&cmd_buffer->trace); + cmd_buffer->trace_rp_drawcalls_end = u_trace_end_iterator(&cmd_buffer->trace); tu_save_pre_chain(cmd_buffer); cmd_buffer->pre_chain.fdm_offset = !!fdm_offsets; if (fdm_offsets) { diff --git a/src/freedreno/vulkan/tu_cmd_buffer.h b/src/freedreno/vulkan/tu_cmd_buffer.h index e8d1c87609d..5f181ec4c60 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.h +++ b/src/freedreno/vulkan/tu_cmd_buffer.h @@ -572,8 +572,8 @@ struct tu_cmd_buffer struct tu_device *device; struct u_trace trace; - struct u_trace_iterator trace_renderpass_start; - struct u_trace_iterator trace_renderpass_end; + struct u_trace_iterator trace_rp_drawcalls_start; + struct u_trace_iterator trace_rp_drawcalls_end; struct list_head renderpass_autotune_results; struct tu_autotune_results_buffer* autotune_buffer; @@ -630,7 +630,7 @@ struct tu_cmd_buffer bool fdm_offset; VkOffset2D fdm_offsets[MAX_VIEWS]; - struct u_trace_iterator trace_renderpass_start, trace_renderpass_end; + struct u_trace_iterator trace_rp_drawcalls_start, trace_rp_drawcalls_end; struct tu_render_pass_state state; diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc index d4de132343a..3c2d3bf8e2b 100644 --- a/src/freedreno/vulkan/tu_device.cc +++ b/src/freedreno/vulkan/tu_device.cc @@ -2127,10 +2127,10 @@ tu_cmd_begin_iterator(struct tu_cmd_buffer *cmdbuf) { switch (cmdbuf->state.suspend_resume) { case SR_IN_PRE_CHAIN: - return cmdbuf->trace_renderpass_end; + return cmdbuf->trace_rp_drawcalls_end; case SR_AFTER_PRE_CHAIN: case SR_IN_CHAIN_AFTER_PRE_CHAIN: - return cmdbuf->pre_chain.trace_renderpass_end; + return cmdbuf->pre_chain.trace_rp_drawcalls_end; default: return u_trace_begin_iterator(&cmdbuf->trace); } @@ -2141,10 +2141,10 @@ tu_cmd_end_iterator(struct tu_cmd_buffer *cmdbuf) { switch (cmdbuf->state.suspend_resume) { case SR_IN_PRE_CHAIN: - return cmdbuf->trace_renderpass_end; + return cmdbuf->trace_rp_drawcalls_end; case SR_IN_CHAIN: case SR_IN_CHAIN_AFTER_PRE_CHAIN: - return cmdbuf->trace_renderpass_start; + return cmdbuf->trace_rp_drawcalls_start; default: return u_trace_end_iterator(&cmdbuf->trace); } diff --git a/src/freedreno/vulkan/tu_dynamic_rendering.cc b/src/freedreno/vulkan/tu_dynamic_rendering.cc index 4d258b68fd3..a883d1dd711 100644 --- a/src/freedreno/vulkan/tu_dynamic_rendering.cc +++ b/src/freedreno/vulkan/tu_dynamic_rendering.cc @@ -148,8 +148,8 @@ tu_insert_dynamic_cmdbufs(struct tu_device *dev, if (!(old_cmds[i]->usage_flags & VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT)) { - u_trace_disable_event_range(old_cmds[i]->pre_chain.trace_renderpass_start, - old_cmds[i]->pre_chain.trace_renderpass_end); + u_trace_disable_event_range(old_cmds[i]->pre_chain.trace_rp_drawcalls_start, + old_cmds[i]->pre_chain.trace_rp_drawcalls_end); } const struct VkOffset2D *fdm_offsets = @@ -201,8 +201,8 @@ tu_insert_dynamic_cmdbufs(struct tu_device *dev, if (old_cmds[i]->usage_flags & VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) { - u_trace_disable_event_range(old_cmds[i]->trace_renderpass_start, - old_cmds[i]->trace_renderpass_end); + u_trace_disable_event_range(old_cmds[i]->trace_rp_drawcalls_start, + old_cmds[i]->trace_rp_drawcalls_end); } /* When the command buffer is finally recorded, we need its state