Skip to content

Commit 67ee8e7

Browse files
captain5050acmel
authored andcommitted
perf tools: Add/use PMU reverse lookup from config to name
Add perf_pmu__name_from_config that does a reverse lookup from a config number to an alias name. The lookup is expensive as the config is computed for every alias by filling in a perf_event_attr, but this is only done when verbose output is enabled. The lookup also only considers config, and not config1, config2 or config3. An example of the output: $ perf stat -vv -e data_read true ... perf_event_attr: type 24 (uncore_imc_free_running_0) size 136 config 0x20ff (data_read) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 exclude_guest 1 ... Committer notes: Fix the python binding build by adding dummies for not strictly needed perf_pmu__name_from_config() and perf_pmus__find_by_type(). Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Tested-by: Kan Liang <kan.liang@linux.intel.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Yang Jihong <yangjihong1@huawei.com> Link: https://lore.kernel.org/r/20240308001915.4060155-7-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 7093882 commit 67ee8e7

File tree

4 files changed

+37
-2
lines changed

4 files changed

+37
-2
lines changed

tools/perf/util/perf_event_attr_fprintf.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,14 @@ static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
222222
}
223223
#endif
224224

225-
static void __p_config_id(char *buf, size_t size, u32 type, u64 value)
225+
static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type, u64 value)
226226
{
227+
const char *name = perf_pmu__name_from_config(pmu, value);
228+
229+
if (name) {
230+
print_id_hex(name);
231+
return;
232+
}
227233
switch (type) {
228234
case PERF_TYPE_HARDWARE:
229235
return __p_config_hw_id(buf, size, value);
@@ -252,7 +258,7 @@ static void __p_config_id(char *buf, size_t size, u32 type, u64 value)
252258
#define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
253259
#define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
254260
#define p_type_id(val) __p_type_id(pmu, buf, BUF_SIZE, val)
255-
#define p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val)
261+
#define p_config_id(val) __p_config_id(pmu, buf, BUF_SIZE, attr->type, val)
256262

257263
#define PRINT_ATTRn(_n, _f, _p, _a) \
258264
do { \

tools/perf/util/pmu.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,3 +2146,21 @@ void perf_pmu__delete(struct perf_pmu *pmu)
21462146
zfree(&pmu->id);
21472147
free(pmu);
21482148
}
2149+
2150+
const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config)
2151+
{
2152+
struct perf_pmu_alias *event;
2153+
2154+
if (!pmu)
2155+
return NULL;
2156+
2157+
pmu_add_cpu_aliases(pmu);
2158+
list_for_each_entry(event, &pmu->aliases, list) {
2159+
struct perf_event_attr attr = {.config = 0,};
2160+
int ret = perf_pmu__config(pmu, &attr, &event->terms, NULL);
2161+
2162+
if (ret == 0 && config == attr.config)
2163+
return event->name;
2164+
}
2165+
return NULL;
2166+
}

tools/perf/util/pmu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,5 +276,6 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const char
276276
struct perf_pmu *perf_pmu__create_placeholder_core_pmu(struct list_head *core_pmus);
277277
void perf_pmu__delete(struct perf_pmu *pmu);
278278
struct perf_pmu *perf_pmus__find_core_pmu(void);
279+
const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config);
279280

280281
#endif /* __PMU_H */

tools/perf/util/python.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ int perf_pmu__scan_file(const struct perf_pmu *pmu, const char *name, const char
103103
return EOF;
104104
}
105105

106+
const char *perf_pmu__name_from_config(struct perf_pmu *pmu __maybe_unused, u64 config __maybe_unused)
107+
{
108+
return NULL;
109+
}
110+
111+
struct perf_pmu *perf_pmus__find_by_type(unsigned int type __maybe_unused)
112+
{
113+
return NULL;
114+
}
115+
106116
int perf_pmus__num_core_pmus(void)
107117
{
108118
return 1;

0 commit comments

Comments
 (0)