Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 21:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf pmu-events: Remove now unused event and metric variables

Browse Source 
Previous changes separated the uses of pmu_event and pmu_metric,
however, both structures contained all the variables of event and
metric. This change removes the event variables from metric and the
metric variables from event.

Note, this change removes the setting of evsel's metric_name/expr as
these fields are no longer part of struct pmu_event. The metric
remains but is no longer implicitly requested when the event is. This
impacts a few Intel uncore events, however, as the ScaleUnit is shared
by the event and the metric this utility is questionable. Also the
MetricNames look broken (contain spaces) in some cases and when trying
to use the functionality with '-e' the metrics fail but regular
metrics with '-M' work. For example, on SkylakeX '-M' works:

```
$ perf stat -M LLC_MISSES.PCIE_WRITE -a sleep 1

 Performance counter stats for 'system wide':

                 0      UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 #  57896.0 Bytes  LLC_MISSES.PCIE_WRITE  (49.84%)
             7,174      UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1                                        (49.85%)
                 0      UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3                                        (50.16%)
                63      UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0                                        (50.15%)

       1.004576381 seconds time elapsed
```

whilst the event '-e' version is broken even with --group/-g (fwiw, we should also remove -g [1]):

```
$ perf stat -g -e LLC_MISSES.PCIE_WRITE -g -a sleep 1
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE
Add UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 event to groups to get metric expression for LLC_MISSES.PCIE_WRITE

 Performance counter stats for 'system wide':

            27,316 Bytes LLC_MISSES.PCIE_WRITE

       1.004505469 seconds time elapsed
```

The code also carries warnings where the user is supposed to select
events for metrics [2] but given the lack of use of such a feature,
let's clean the code and just remove.

[1] https://lore.kernel.org/lkml/20220707195610.303254-1-irogers@google.com/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/perf/util/stat-shadow.c?id=01b8957b738f42f96a130079bc951b3cc78c5b8a#n425

Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20230126233645.200509-7-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2023-01-26 15:36:36 -08:00 committed by Arnaldo Carvalho de Melo
parent 96d2a74618
commit d9dc8874d6
9 changed files with 36 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/builtin-list.c
View File

@ -99,8 +99,7 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi
const char *scale_unit __maybe_unused, const char *scale_unit __maybe_unused,
bool deprecated, const char *event_type_desc, bool deprecated, const char *event_type_desc,
const char *desc, const char *long_desc, const char *desc, const char *long_desc,
const char *encoding_desc, const char *encoding_desc)
const char *metric_name, const char *metric_expr)
{ {
struct print_state *print_state = ps; struct print_state *print_state = ps;
int pos; int pos;
@ -159,10 +158,6 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi
if (print_state->detailed && encoding_desc) { if (print_state->detailed && encoding_desc) {
printf("%*s", 8, ""); printf("%*s", 8, "");
wordwrap(encoding_desc, 8, pager_get_columns(), 0); wordwrap(encoding_desc, 8, pager_get_columns(), 0);
if (metric_name)
printf(" MetricName: %s", metric_name);
if (metric_expr)
printf(" MetricExpr: %s", metric_expr);
putchar('\n'); putchar('\n');
} }
} }
@ -308,8 +303,7 @@ static void json_print_event(void *ps, const char *pmu_name, const char *topic,
const char *scale_unit, const char *scale_unit,
bool deprecated, const char *event_type_desc, bool deprecated, const char *event_type_desc,
const char *desc, const char *long_desc, const char *desc, const char *long_desc,
const char *encoding_desc, const char *encoding_desc)
const char *metric_name, const char *metric_expr)
{ {
struct json_print_state *print_state = ps; struct json_print_state *print_state = ps;
bool need_sep = false; bool need_sep = false;
@ -366,16 +360,6 @@ static void json_print_event(void *ps, const char *pmu_name, const char *topic,
encoding_desc); encoding_desc);
need_sep = true; need_sep = true;
} }
if (metric_name) {
fix_escape_printf(&buf, "%s\t\"MetricName\": \"%S\"", need_sep ? ",\n" : "",
metric_name);
need_sep = true;
}
if (metric_expr) {
fix_escape_printf(&buf, "%s\t\"MetricExpr\": \"%S\"", need_sep ? ",\n" : "",
metric_expr);
need_sep = true;
}
printf("%s}", need_sep ? "\n" : ""); printf("%s}", need_sep ? "\n" : "");
strbuf_release(&buf); strbuf_release(&buf);
} }

16
tools/perf/pmu-events/jevents.py
View File

@ -37,6 +37,11 @@ _json_event_attributes = [
'metric_constraint', 'metric_expr', 'long_desc' 'metric_constraint', 'metric_expr', 'long_desc'
] ]
# Attributes that are in pmu_metric rather than pmu_event.
_json_metric_attributes = [
'metric_name', 'metric_group', 'metric_constraint', 'metric_expr', 'desc',
'long_desc', 'unit', 'compat', 'aggr_mode'
]
def removesuffix(s: str, suffix: str) -> str: def removesuffix(s: str, suffix: str) -> str:
"""Remove the suffix from a string """Remove the suffix from a string
@ -569,6 +574,9 @@ static void decompress_event(int offset, struct pmu_event *pe)
\tconst char *p = &big_c_string[offset]; \tconst char *p = &big_c_string[offset];
""") """)
for attr in _json_event_attributes: for attr in _json_event_attributes:
if attr in _json_metric_attributes and 'metric_' in attr:
_args.output_file.write(f'\n\t/* Skip {attr} */\n')
else:
_args.output_file.write(f""" _args.output_file.write(f"""
\tpe->{attr} = (*p == '\\0' ? NULL : p); \tpe->{attr} = (*p == '\\0' ? NULL : p);
""") """)
@ -576,14 +584,18 @@ static void decompress_event(int offset, struct pmu_event *pe)
continue continue
_args.output_file.write('\twhile (*p++);') _args.output_file.write('\twhile (*p++);')
_args.output_file.write("""} _args.output_file.write("""}
static void decompress_metric(int offset, struct pmu_metric *pe)
static void decompress_metric(int offset, struct pmu_metric *pm)
{ {
\tconst char *p = &big_c_string[offset]; \tconst char *p = &big_c_string[offset];
""") """)
for attr in _json_event_attributes: for attr in _json_event_attributes:
if attr in _json_metric_attributes:
_args.output_file.write(f""" _args.output_file.write(f"""
\tpe->{attr} = (*p == '\\0' ? NULL : p); \tpm->{attr} = (*p == '\\0' ? NULL : p);
""") """)
else:
_args.output_file.write(f'\n\t/* Skip {attr} */\n')
if attr == _json_event_attributes[-1]: if attr == _json_event_attributes[-1]:
continue continue
_args.output_file.write('\twhile (*p++);') _args.output_file.write('\twhile (*p++);')

22
tools/perf/pmu-events/pmu-events.h
View File

@ -23,29 +23,19 @@ struct pmu_event {
const char *unit; const char *unit;
const char *perpkg; const char *perpkg;
const char *aggr_mode; const char *aggr_mode;
const char *metric_expr;
const char *metric_name;
const char *metric_group;
const char *deprecated; const char *deprecated;
const char *metric_constraint;
}; };
struct pmu_metric { struct pmu_metric {
const char *name;
const char *compat;
const char *event;
const char *desc;
const char *topic;
const char *long_desc;
const char *pmu;
const char *unit;
const char *perpkg;
const char *aggr_mode;
const char *metric_expr;
const char *metric_name; const char *metric_name;
const char *metric_group; const char *metric_group;
const char *deprecated; const char *metric_expr;
const char *unit;
const char *compat;
const char *aggr_mode;
const char *metric_constraint; const char *metric_constraint;
const char *desc;
const char *long_desc;
}; };
struct pmu_events_table; struct pmu_events_table;

27
tools/perf/tests/pmu-events.c
View File

@ -337,36 +337,12 @@ static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event
return -1; return -1;
} }
if (!is_same(e1->metric_expr, e2->metric_expr)) {
pr_debug2("testing event e1 %s: mismatched metric_expr, %s vs %s\n",
e1->name, e1->metric_expr, e2->metric_expr);
return -1;
}
if (!is_same(e1->metric_name, e2->metric_name)) {
pr_debug2("testing event e1 %s: mismatched metric_name, %s vs %s\n",
e1->name, e1->metric_name, e2->metric_name);
return -1;
}
if (!is_same(e1->metric_group, e2->metric_group)) {
pr_debug2("testing event e1 %s: mismatched metric_group, %s vs %s\n",
e1->name, e1->metric_group, e2->metric_group);
return -1;
}
if (!is_same(e1->deprecated, e2->deprecated)) { if (!is_same(e1->deprecated, e2->deprecated)) {
pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n", pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n",
e1->name, e1->deprecated, e2->deprecated); e1->name, e1->deprecated, e2->deprecated);
return -1; return -1;
} }
if (!is_same(e1->metric_constraint, e2->metric_constraint)) {
pr_debug2("testing event e1 %s: mismatched metric_constant, %s vs %s\n",
e1->name, e1->metric_constraint, e2->metric_constraint);
return -1;
}
return 0; return 0;
} }
@ -432,9 +408,6 @@ static int test__pmu_event_table_core_callback(const struct pmu_event *pe,
struct perf_pmu_test_event const **test_event_table; struct perf_pmu_test_event const **test_event_table;
bool found = false; bool found = false;
if (!pe->name)
return 0;
if (pe->pmu) if (pe->pmu)
test_event_table = &uncore_events[0]; test_event_table = &uncore_events[0];
else else

2
tools/perf/util/parse-events.c
View File

@ -1570,8 +1570,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
evsel->scale = info.scale; evsel->scale = info.scale;
evsel->per_pkg = info.per_pkg; evsel->per_pkg = info.per_pkg;
evsel->snapshot = info.snapshot; evsel->snapshot = info.snapshot;
evsel->metric_expr = info.metric_expr;
evsel->metric_name = info.metric_name;
return 0; return 0;
} }

35
tools/perf/util/pmu.c
View File

@ -280,10 +280,6 @@ static void perf_pmu_update_alias(struct perf_pmu_alias *old,
perf_pmu_assign_str(old->name, "long_desc", &old->long_desc, perf_pmu_assign_str(old->name, "long_desc", &old->long_desc,
&newalias->long_desc); &newalias->long_desc);
perf_pmu_assign_str(old->name, "topic", &old->topic, &newalias->topic); perf_pmu_assign_str(old->name, "topic", &old->topic, &newalias->topic);
perf_pmu_assign_str(old->name, "metric_expr", &old->metric_expr,
&newalias->metric_expr);
perf_pmu_assign_str(old->name, "metric_name", &old->metric_name,
&newalias->metric_name);
perf_pmu_assign_str(old->name, "value", &old->str, &newalias->str); perf_pmu_assign_str(old->name, "value", &old->str, &newalias->str);
old->scale = newalias->scale; old->scale = newalias->scale;
old->per_pkg = newalias->per_pkg; old->per_pkg = newalias->per_pkg;
@ -299,8 +295,6 @@ void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
zfree(&newalias->long_desc); zfree(&newalias->long_desc);
zfree(&newalias->topic); zfree(&newalias->topic);
zfree(&newalias->str); zfree(&newalias->str);
zfree(&newalias->metric_expr);
zfree(&newalias->metric_name);
zfree(&newalias->pmu_name); zfree(&newalias->pmu_name);
parse_events_terms__purge(&newalias->terms); parse_events_terms__purge(&newalias->terms);
free(newalias); free(newalias);
@ -337,16 +331,13 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
int num; int num;
char newval[256]; char newval[256];
char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL, char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL,
*metric_expr = NULL, *metric_name = NULL, *deprecated = NULL, *deprecated = NULL, *pmu_name = NULL;
*pmu_name = NULL;
if (pe) { if (pe) {
long_desc = (char *)pe->long_desc; long_desc = (char *)pe->long_desc;
topic = (char *)pe->topic; topic = (char *)pe->topic;
unit = (char *)pe->unit; unit = (char *)pe->unit;
perpkg = (char *)pe->perpkg; perpkg = (char *)pe->perpkg;
metric_expr = (char *)pe->metric_expr;
metric_name = (char *)pe->metric_name;
deprecated = (char *)pe->deprecated; deprecated = (char *)pe->deprecated;
pmu_name = (char *)pe->pmu; pmu_name = (char *)pe->pmu;
} }
@ -401,8 +392,6 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
perf_pmu__parse_snapshot(alias, dir, name); perf_pmu__parse_snapshot(alias, dir, name);
} }
alias->metric_expr = metric_expr ? strdup(metric_expr) : NULL;
alias->metric_name = metric_name ? strdup(metric_name): NULL;
alias->desc = desc ? strdup(desc) : NULL; alias->desc = desc ? strdup(desc) : NULL;
alias->long_desc = long_desc ? strdup(long_desc) : alias->long_desc = long_desc ? strdup(long_desc) :
desc ? strdup(desc) : NULL; desc ? strdup(desc) : NULL;
@ -756,9 +745,6 @@ static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe,
struct pmu_add_cpu_aliases_map_data *data = vdata; struct pmu_add_cpu_aliases_map_data *data = vdata;
const char *pname = pe->pmu ? pe->pmu : data->cpu_name; const char *pname = pe->pmu ? pe->pmu : data->cpu_name;
if (!pe->name)
return 0;
if (data->pmu->is_uncore && pmu_uncore_alias_match(pname, data->name)) if (data->pmu->is_uncore && pmu_uncore_alias_match(pname, data->name))
goto new_alias; goto new_alias;
@ -813,12 +799,6 @@ static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe,
struct pmu_sys_event_iter_data *idata = data; struct pmu_sys_event_iter_data *idata = data;
struct perf_pmu *pmu = idata->pmu; struct perf_pmu *pmu = idata->pmu;
if (!pe->name) {
if (pe->metric_group || pe->metric_name)
return 0;
return -EINVAL;
}
if (!pe->compat || !pe->pmu) if (!pe->compat || !pe->pmu)
return 0; return 0;
@ -1400,8 +1380,6 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
info->unit = NULL; info->unit = NULL;
info->scale = 0.0; info->scale = 0.0;
info->snapshot = false; info->snapshot = false;
info->metric_expr = NULL;
info->metric_name = NULL;
list_for_each_entry_safe(term, h, head_terms, list) { list_for_each_entry_safe(term, h, head_terms, list) {
alias = pmu_find_alias(pmu, term); alias = pmu_find_alias(pmu, term);
@ -1417,8 +1395,6 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
if (alias->per_pkg) if (alias->per_pkg)
info->per_pkg = true; info->per_pkg = true;
info->metric_expr = alias->metric_expr;
info->metric_name = alias->metric_name;
list_del_init(&term->list); list_del_init(&term->list);
parse_events_term__delete(term); parse_events_term__delete(term);
@ -1634,8 +1610,7 @@ void print_pmu_events(const struct print_callbacks *print_cb, void *print_state)
for (j = 0; j < len; j++) { for (j = 0; j < len; j++) {
const char *name, *alias = NULL, *scale_unit = NULL, const char *name, *alias = NULL, *scale_unit = NULL,
*desc = NULL, *long_desc = NULL, *desc = NULL, *long_desc = NULL,
*encoding_desc = NULL, *topic = NULL, *encoding_desc = NULL, *topic = NULL;
*metric_name = NULL, *metric_expr = NULL;
bool deprecated = false; bool deprecated = false;
size_t buf_used; size_t buf_used;
@ -1673,8 +1648,6 @@ void print_pmu_events(const struct print_callbacks *print_cb, void *print_state)
buf_used += snprintf(buf + buf_used, sizeof(buf) - buf_used, buf_used += snprintf(buf + buf_used, sizeof(buf) - buf_used,
"%s/%s/", aliases[j].pmu->name, "%s/%s/", aliases[j].pmu->name,
aliases[j].event->str) + 1; aliases[j].event->str) + 1;
metric_name = aliases[j].event->metric_name;
metric_expr = aliases[j].event->metric_expr;
deprecated = aliases[j].event->deprecated; deprecated = aliases[j].event->deprecated;
} }
print_cb->print_event(print_state, print_cb->print_event(print_state,
@ -1687,9 +1660,7 @@ void print_pmu_events(const struct print_callbacks *print_cb, void *print_state)
"Kernel PMU event", "Kernel PMU event",
desc, desc,
long_desc, long_desc,
encoding_desc, encoding_desc);
metric_name,
metric_expr);
} }
if (printed && pager_in_use()) if (printed && pager_in_use())
printf("\n"); printf("\n");

9
tools/perf/util/pmu.h
View File

@ -132,8 +132,6 @@ extern struct perf_pmu perf_pmu__fake;
struct perf_pmu_info { struct perf_pmu_info {
const char *unit; const char *unit;
const char *metric_expr;
const char *metric_name;
double scale; double scale;
bool per_pkg; bool per_pkg;
bool snapshot; bool snapshot;
@ -187,13 +185,6 @@ struct perf_pmu_alias {
* default. * default.
*/ */
bool deprecated; bool deprecated;
/**
* @metric_expr: A metric expression associated with an event. Doing
* this makes little sense due to scale and unit applying to both.
*/
char *metric_expr;
/** @metric_name: A name for the metric. unit applying to both. */
char *metric_name;
/** @pmu_name: The name copied from struct perf_pmu. */ /** @pmu_name: The name copied from struct perf_pmu. */
char *pmu_name; char *pmu_name;
}; };

32
tools/perf/util/print-events.c
View File

@ -101,9 +101,7 @@ void print_tracepoint_events(const struct print_callbacks *print_cb, void *print
"Tracepoint event", "Tracepoint event",
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
} }
free(dir_path); free(dir_path);
free(evt_namelist); free(evt_namelist);
@ -195,9 +193,7 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
"SDT event", "SDT event",
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
free(evt_name); free(evt_name);
} }
@ -255,9 +251,7 @@ int print_hwcache_events(const struct print_callbacks *print_cb, void *print_sta
event_type_descriptors[PERF_TYPE_HW_CACHE], event_type_descriptors[PERF_TYPE_HW_CACHE],
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
} }
strlist__delete(evt_name_list); strlist__delete(evt_name_list);
return 0; return 0;
@ -277,9 +271,7 @@ void print_tool_events(const struct print_callbacks *print_cb, void *print_state
"Tool event", "Tool event",
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
} }
} }
@ -331,9 +323,7 @@ void print_symbol_events(const struct print_callbacks *print_cb, void *print_sta
event_type_descriptors[type], event_type_descriptors[type],
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
} }
strlist__delete(evt_name_list); strlist__delete(evt_name_list);
} }
@ -364,9 +354,7 @@ void print_events(const struct print_callbacks *print_cb, void *print_state)
event_type_descriptors[PERF_TYPE_RAW], event_type_descriptors[PERF_TYPE_RAW],
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
print_cb->print_event(print_state, print_cb->print_event(print_state,
/*topic=*/NULL, /*topic=*/NULL,
@ -378,9 +366,7 @@ void print_events(const struct print_callbacks *print_cb, void *print_state)
event_type_descriptors[PERF_TYPE_RAW], event_type_descriptors[PERF_TYPE_RAW],
"(see 'man perf-list' on how to encode it)", "(see 'man perf-list' on how to encode it)",
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
print_cb->print_event(print_state, print_cb->print_event(print_state,
/*topic=*/NULL, /*topic=*/NULL,
@ -392,9 +378,7 @@ void print_events(const struct print_callbacks *print_cb, void *print_state)
event_type_descriptors[PERF_TYPE_BREAKPOINT], event_type_descriptors[PERF_TYPE_BREAKPOINT],
/*desc=*/NULL, /*desc=*/NULL,
/*long_desc=*/NULL, /*long_desc=*/NULL,
/*encoding_desc=*/NULL, /*encoding_desc=*/NULL);
/*metric_name=*/NULL,
/*metric_expr=*/NULL);
print_tracepoint_events(print_cb, print_state); print_tracepoint_events(print_cb, print_state);

3
tools/perf/util/print-events.h
View File

@ -16,8 +16,7 @@ struct print_callbacks {
const char *scale_unit, const char *scale_unit,
bool deprecated, const char *event_type_desc, bool deprecated, const char *event_type_desc,
const char *desc, const char *long_desc, const char *desc, const char *long_desc,
const char *encoding_desc, const char *encoding_desc);
const char *metric_name, const char *metric_expr);
void (*print_metric)(void *print_state, void (*print_metric)(void *print_state,
const char *group, const char *group,
const char *name, const char *name,