fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 13:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tu: Rename u_trace renderpass iterators

Browse source 
They are not around renderpass but around draw_cs inside a renderpass.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34981>
This commit is contained in:
Danylo Piliaiev 2025-05-14 17:08:47 +02:00 • committed by Marge Bot
parent 7e9ee2000a
commit 1cd2a857d6
4 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/freedreno/vulkan/tu_cmd_buffer.cc
View file

@ -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<CHIP>(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<CHIP>(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<CHIP>(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<CHIP>(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<CHIP>(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) {

6
src/freedreno/vulkan/tu_cmd_buffer.h
View file

@ -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;

8
src/freedreno/vulkan/tu_device.cc
View file

@ -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);
}

8
src/freedreno/vulkan/tu_dynamic_rendering.cc
View file

@ -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