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

util/u_trace: Add support for fixed-length string params in tracepoints

Browse Source 
The argument would look like:
 Arg(type='str', var='ubwc', c_format='%s', length_arg='12', copy_func='strncpy')

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29707>
This commit is contained in:
Danylo Piliaiev
2024-05-30 17:09:11 +02:00
committed by Marge Bot
parent aba7140b38
commit 0aa0c065df
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/perf/u_trace.py
View File

@@ -66,7 +66,7 @@ class Tracepoint(object):
self.tp_struct = tp_struct
self.has_variable_arg = False
for arg in self.tp_struct:
if arg.length_arg != None:
if arg.length_arg != None and not arg.length_arg.isdigit():
self.has_variable_arg = True
break
self.tp_print = tp_print
@@ -106,6 +106,8 @@ class TracepointArgStruct():
self.type = type
self.var = var
self.func_param = f"{self.type} {self.var}"
class TracepointArg(object):
"""Class that represents either an argument being passed or a field in a struct
"""
@@ -135,6 +137,18 @@ class TracepointArg(object):
self.length_arg = length_arg
self.copy_func = copy_func
if self.type == "str":
self.struct_member = f"char {self.name}[{length_arg} + 1]"
elif self.length_arg:
self.struct_member = f"{self.type} {self.name}[0]"
else:
self.struct_member = f"{self.type} {self.name}"
if self.type == "str":
self.func_param = f"const char *{self.var}"
else:
self.func_param = f"{self.type} {self.var}"
HEADERS = []
@@ -230,7 +244,7 @@ void ${trace_toggle_name}_config_variable(void);
*/
struct trace_${trace_name} {
% for arg in trace.tp_struct:
${arg.type} ${arg.name}${"[0]" if arg.length_arg else ""};
${arg.struct_member};
% endfor
% if len(trace.args) == 0:
#ifdef __cplusplus
@@ -261,7 +275,7 @@ void __trace_${trace_name}(
, void *cs
% endif
% for arg in trace.args:
, ${arg.type} ${arg.var}
, ${arg.func_param}
% endfor
);
static ALWAYS_INLINE void trace_${trace_name}(
@@ -270,7 +284,7 @@ static ALWAYS_INLINE void trace_${trace_name}(
, void *cs
% endif
% for arg in trace.args:
, ${arg.type} ${arg.var}
, ${arg.func_param}
% endfor
) {
enum u_trace_type enabled_traces = p_atomic_read_relaxed(&ut->utctx->enabled_traces);
@@ -466,7 +480,7 @@ void __trace_${trace_name}(
, void *cs
% endif
% for arg in trace.args:
, ${arg.type} ${arg.var}
, ${arg.func_param}
% endfor
) {
struct trace_${trace_name} entry;
@@ -476,7 +490,7 @@ void __trace_${trace_name}(
(struct trace_${trace_name} *)u_trace_appendv(ut, ${"cs," if trace.need_cs_param else "NULL,"} &__tp_${trace_name},
0
% for arg in trace.tp_struct:
% if arg.length_arg is not None:
% if arg.length_arg is not None and not arg.length_arg.isdigit():
+ ${arg.length_arg}
% endif
% endfor
@@ -486,7 +500,7 @@ void __trace_${trace_name}(
% endif
&entry;
% for arg in trace.tp_struct:
% if arg.length_arg is None:
% if arg.copy_func is None:
__entry->${arg.name} = ${arg.var};
% else:
${arg.copy_func}(__entry->${arg.name}, ${arg.var}, ${arg.length_arg});