perf list: Display hybrid pmu events with cpu type
PATCH 1/1 perf list: Display hybrid pmu events with cpu type
Add a new option '--cputype' to perf-list to display core-only pmu events or atom-only pmu events.
Each hybrid pmu event has been assigned with a pmu name, this patch compares the pmu name before listing the result.
For example,
perf list --cputype atom
...
cache:
core_reject_l2q.any
[Counts the number of request that were not accepted into the L2Q because the L2Q is FULL. Unit: cpu_atom]
...
The "Unit: cpu_atom" is displayed in the brief description section to indicate this is an atom event.
Signed-off-by Jin Yao <[email protected]>
--- tools/perf/Documentation/perf-list.txt | 4 +++ tools/perf/builtin-list.c | 42 ++++++++++++++++++-------- tools/perf/util/metricgroup.c | 7 ++++- tools/perf/util/metricgroup.h | 2 +- tools/perf/util/parse-events.c | 8 +++-- tools/perf/util/parse-events.h | 3 +- tools/perf/util/pmu.c | 29 +++++++++++++++--- tools/perf/util/pmu.h | 2 +- 8 files changed, 73 insertions(+), 24 deletions(-)
tools/perf/Documentation/perf-list.txt +4 -0
@@ -39,6 +39,10 @@ any extra expressions computed by perf stat. --deprecated:: Print deprecated events. By default the deprecated events are hidden. +--cputype:: +Print events applying cpu with this type for hybrid platform +(e.g. --cputype core or --cputype atom) + [[EVENT_MODIFIERS]] EVENT MODIFIERS ---------------
tools/perf/builtin-list.c +30 -12
102 lines not on this page · raw message
tools/perf/util/metricgroup.c +6 -1
@@ -11,6 +11,7 @@#include "evsel.h" #include "strbuf.h" #include "pmu.h" +#include "pmu-hybrid.h" #include "expr.h" #include "rblist.h" #include <string.h>
@@ -616,7 +617,7 @@ static int metricgroup__print_sys_event_iter(struct pmu_event *pe, void *data) }void metricgroup__print (bool metrics,bool metricgroups,char *filter, -bool raw,bool details) +bool raw,bool details,const char *pmu_name) {struct pmu_events_map *map =pmu_events_map__find ();struct pmu_event *pe;
@@ -642,6 +643,10 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,break ;if (!pe->metric_expr)continue ; +if (pmu_name &&perf_pmu__is_hybrid (pe->pmu) && +strcmp (pmu_name, pe->pmu)) { +continue ; + }if (metricgroup__print_pmu_event (pe, metricgroups, filter, raw, details, &groups, metriclist) <0 )
tools/perf/util/metricgroup.h +1 -1
@@ -53,7 +53,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist, struct rblist *metric_events);void metricgroup__print (bool metrics,bool groups,char *filter, -bool raw,bool details); +bool raw,bool details,const char *pmu_name);bool metricgroup__has_metric (const char *metric);int arch_get_runtimeparam (struct pmu_event *pe__maybe_unused );void metricgroup__rblist_exit (struct rblist *metric_events);
tools/perf/util/parse-events.c +5 -3
@@ -2995,7 +2995,8 @@ void print_symbol_events(const char *event_glob, unsigned type,* Print the help text for the event symbols: */ void print_events (const char *event_glob,bool name_only,bool quiet_flag, -bool long_desc,bool details_flag,bool deprecated) +bool long_desc,bool details_flag,bool deprecated, +const char *pmu_name) {print_symbol_events (event_glob,PERF_TYPE_HARDWARE , event_symbols_hw,PERF_COUNT_HW_MAX , name_only);
@@ -3007,7 +3008,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,print_hwcache_events (event_glob, name_only);print_pmu_events (event_glob, name_only, quiet_flag, long_desc, - details_flag, deprecated); + details_flag, deprecated, pmu_name);if (event_glob !=NULL )return ;
@@ -3033,7 +3034,8 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,print_sdt_events (NULL ,NULL , name_only); -metricgroup__print (true, true,NULL , name_only, details_flag); +metricgroup__print (true, true,NULL , name_only, details_flag, + pmu_name);print_libpfm_events (name_only, long_desc); }
tools/perf/util/parse-events.h +2 -1
@@ -219,7 +219,8 @@ void parse_events_evlist_error(struct parse_events_state *parse_state, int idx, const char *str);void print_events (const char *event_glob,bool name_only,bool quiet, -bool long_desc,bool details_flag,bool deprecated); +bool long_desc,bool details_flag,bool deprecated, +const char *pmu_name);struct event_symbol {const char *symbol;
tools/perf/util/pmu.c +24 -5
@@ -1556,6 +1556,7 @@ static int cmp_sevent(const void *a, const void *b) {const struct sevent *as = a;const struct sevent *bs = b; +int ret;/* Put extra events last */ if (!!as->desc != !!bs->desc)
@@ -1571,7 +1572,13 @@ static int cmp_sevent(const void *a, const void *b)if (as->is_cpu != bs->is_cpu)return bs->is_cpu - as->is_cpu; -return strcmp (as->name, bs->name); + ret =strcmp (as->name, bs->name); +if (!ret) { +if (as->pmu && bs->pmu) +return strcmp (as->pmu, bs->pmu); + } + +return ret; }static void wordwrap (char *s,int start,int max,int corr)
@@ -1601,7 +1608,8 @@ bool is_pmu_core(const char *name) }void print_pmu_events (const char *event_glob,bool name_only,bool quiet_flag, -bool long_desc,bool details_flag,bool deprecated) +bool long_desc,bool details_flag,bool deprecated, +const char *pmu_name) {struct perf_pmu *pmu;struct perf_pmu_alias *alias;
@@ -1627,10 +1635,16 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag, pmu =NULL ; j =0 ;while ((pmu =perf_pmu__scan (pmu)) !=NULL ) { +if (pmu_name &&perf_pmu__is_hybrid (pmu->name) && +strcmp (pmu_name, pmu->name)) { +continue ; + } +list_for_each_entry (alias, &pmu->aliases, list) {char *name = alias->desc ? alias->name :format_alias (buf,sizeof (buf), pmu, alias); -bool is_cpu =is_pmu_core (pmu->name); +bool is_cpu =is_pmu_core (pmu->name) || +perf_pmu__is_hybrid (pmu->name);if (alias->deprecated && !deprecated)continue ;
@@ -1678,8 +1692,13 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag,qsort (aliases, len,sizeof (struct sevent ), cmp_sevent);for (j =0 ; j < len; j++) {/* Skip duplicates */ -if (j >0 && !strcmp (aliases[j].name, aliases[j -1 ].name)) -continue ; +if (j >0 && !strcmp (aliases[j].name, aliases[j -1 ].name)) { +if (!aliases[j].pmu || !aliases[j -1 ].pmu || + !strcmp (aliases[j].pmu, aliases[j -1 ].pmu)) { +continue ; + } + } +if (name_only) {printf ("%s " , aliases[j].name);continue ;
tools/perf/util/pmu.h +1 -1
@@ -107,7 +107,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);bool is_pmu_core (const char *name);void print_pmu_events (const char *event_glob,bool name_only,bool quiet,bool long_desc,bool details_flag, -bool deprecated); +bool deprecated,const char *pmu_name);bool pmu_have_event (const char *pname,const char *name); int perf_pmu__scan_file(struct perf_pmu *pmu, const char *name, const char *fmt, ...) __scanf(3, 4);
Signature · 1 line
2.17.1