OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/ds: add query count in query tracepoints

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23074>
This commit is contained in:
Lionel Landwerlin
2023-06-13 11:11:27 +03:00
parent 930e862af7
commit e86f3c7abb
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/intel/ds/intel_driver_ds.cc
View File

@@ -394,7 +394,8 @@ CREATE_DUAL_EVENT_CALLBACK(generate_draws, INTEL_DS_QUEUE_STAGE_GENERATE_DRAWS)
CREATE_DUAL_EVENT_CALLBACK(trace_copy, INTEL_DS_QUEUE_STAGE_BLORP)
CREATE_DUAL_EVENT_CALLBACK(query_clear_blorp, INTEL_DS_QUEUE_STAGE_BLORP)
CREATE_DUAL_EVENT_CALLBACK(query_clear_cs, INTEL_DS_QUEUE_STAGE_CMD_BUFFER)
CREATE_DUAL_EVENT_CALLBACK(query_copy, INTEL_DS_QUEUE_STAGE_CMD_BUFFER)
CREATE_DUAL_EVENT_CALLBACK(query_copy_cs, INTEL_DS_QUEUE_STAGE_CMD_BUFFER)
CREATE_DUAL_EVENT_CALLBACK(query_copy_shader, INTEL_DS_QUEUE_STAGE_BLORP)
void
intel_ds_begin_cmd_buffer_annotation(struct intel_ds_device *device,

11
src/intel/ds/intel_tracepoints.py
View File

@@ -122,11 +122,16 @@ def define_tracepoints(args):
begin_end_tp('generate_draws')
# vkCmdResetQuery, only for Anv
begin_end_tp('query_clear_blorp')
begin_end_tp('query_clear_cs', end_pipelined=False)
begin_end_tp('query_clear_blorp',
tp_args=[Arg(type='uint32_t', var='count', c_format='%u')])
begin_end_tp('query_clear_cs',
tp_args=[Arg(type='uint32_t', var='count', c_format='%u')],
end_pipelined=False)
# vkCmdCopyQueryResults, only for Anv
begin_end_tp('query_copy', end_pipelined=False)
begin_end_tp('query_copy',
tp_args=[Arg(type='uint32_t', var='count', c_format='%u')],
end_pipelined=False)
# Various draws/dispatch, Anv & Iris
begin_end_tp('draw',

6
src/intel/vulkan/genX_query.c
View File

@@ -798,7 +798,7 @@ void genX(CmdResetQueryPool)(
cmd_buffer->state.pending_query_bits =
ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(cmd_buffer->device->info);
trace_intel_end_query_clear_blorp(&cmd_buffer->trace);
trace_intel_end_query_clear_blorp(&cmd_buffer->trace, queryCount);
return;
}
@@ -878,7 +878,7 @@ void genX(CmdResetQueryPool)(
unreachable("Unsupported query type");
}
trace_intel_end_query_clear_cs(&cmd_buffer->trace);
trace_intel_end_query_clear_cs(&cmd_buffer->trace, queryCount);
}
void genX(ResetQueryPool)(
@@ -1649,7 +1649,7 @@ void genX(CmdCopyQueryPoolResults)(
dest_addr = anv_address_add(dest_addr, destStride);
}
trace_intel_end_query_copy(&cmd_buffer->trace);
trace_intel_end_query_copy(&cmd_buffer->trace, queryCount);
}
#if GFX_VERx10 >= 125 && ANV_SUPPORT_RT