perf list: Remove dead code in argument check
Namhyung Kim
maintainerPATCH 1/3 perf list: Remove dead code in argument check
The sep is already checked being not NULL. The code seems to be a leftover from some refactoring.
tools/perf/builtin-list.c +0 -7
@@ -92,13 +92,6 @@ int cmd_list(int argc, const char **argv)else if ((sep =strchr (argv[i],':' )) !=NULL ) {int sep_idx; -if (sep ==NULL ) { -print_events (argv[i], raw_dump, !desc_flag, - long_desc_flag, - details_flag, - deprecated); -continue ; - } sep_idx = sep - argv[i]; s =strdup (argv[i]);if (s ==NULL )
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Namhyung Kim
maintainerPATCH 2/3 perf list: Do not print 'Metric Groups:' unnecessarily
It was printed unconditionally even if nothing is printed. Check if the output list empty when filter is given.
Before:
$ ./perf list duration
List of pre-defined events (to be used in -e):
duration_time [Tool event]
Metric Groups:
After:
$ ./perf list duration
List of pre-defined events (to be used in -e):
duration_time [Tool event]
tools/perf/util/metricgroup.c +6 -4
@@ -535,10 +535,12 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, } } -if (metricgroups && !raw) -printf ("\nMetric Groups:\n\n" ); -else if (metrics && !raw) -printf ("\nMetrics:\n\n" ); +if (!filter || !rblist__empty (&groups)) { +if (metricgroups && !raw) +printf ("\nMetric Groups:\n\n" ); +else if (metrics && !raw) +printf ("\nMetrics:\n\n" ); + }for (node =rb_first_cached (&groups.entries); node; node = next) { struct mep *me = container_of(node, struct mep, nd);
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Re: [PATCH 2/3] perf list: Do not print 'Metric Groups:' unnecessarily
Em Wed, Sep 09, 2020 at 02:58:48PM +0900, Namhyung Kim escreveu:
Quoted 12 lines
It was printed unconditionally even if nothing is printed. Check if the output list empty when filter is given.
Before:
$ ./perf list durationList of pre-defined events (to be used in -e):
duration_time[Tool event]Metric Groups:
Quoted 8 lines
After:
$ ./perf list durationList of pre-defined events (to be used in -e):
duration_time[Tool event]Signed-off-by Namhyung Kim <[email protected]>
---
Thanks, applied.
- Arnaldo
Quoted 25 lines
tools/perf/util/metricgroup.c +6
-4@@ -535,10 +535,12 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, } } -if (metricgroups && !raw) -printf ("\nMetric Groups:\n\n" ); -else if (metrics && !raw) -printf ("\nMetrics:\n\n" ); +if (!filter || !rblist__empty (&groups)) { +if (metricgroups && !raw) +printf ("\nMetric Groups:\n\n" ); +else if (metrics && !raw) +printf ("\nMetrics:\n\n" ); + }for (node =rb_first_cached (&groups.entries); node; node = next) { struct mep *me = container_of(node, struct mep, nd);Signature · 1 line
2.28.0.526.ge36021eeef-goog
Signature · 1 line
- Arnaldo
Namhyung Kim
maintainerPATCH 3/3 perf list: Add 'pfm' to list libpfm4 events
In reply to Namhyung KimPrint libpfm4 events with 'perf list pfm' command like others. When libpfm4 support is not enabled, it'd print nothing. Also it support glob pattern matching for event name.
$ perf list pfm
List of pre-defined events (to be used in --pfm-events):
ix86arch:
UNHALTED_CORE_CYCLES
[count core clock cycles whenever the clock signal ...
INSTRUCTION_RETIRED
[count the number of instructions at retirement. ...
...
tools/perf/builtin-list.c +6 -2
@@ -14,6 +14,7 @@#include "util/pmu.h" #include "util/debug.h" #include "util/metricgroup.h" +#include "util/pfm.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include <stdio.h>
@@ -42,7 +43,7 @@ int cmd_list(int argc, const char **argv) OPT_END() };const char *const list_usage[] = { -"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|event_glob]" , +"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|pfm|event_glob]" ,NULL };
@@ -53,7 +54,7 @@ int cmd_list(int argc, const char **argv)setup_pager (); -if (!raw_dump &&pager_in_use ()) +if (!raw_dump &&pager_in_use () && (argc !=1 ||strcmp (argv[0 ],"pfm" )))printf ("\nList of pre-defined events (to be used in -e):\n\n" );if (argc ==0 ) {
@@ -89,6 +90,8 @@ int cmd_list(int argc, const char **argv)metricgroup__print (true, false,NULL , raw_dump, details_flag); else if (strcmp(argv[i], "metricgroup") == 0 || strcmp(argv[i], "metricgroups") == 0) metricgroup__print(false, true,NULL , raw_dump, details_flag); + else if (strcmp(argv[i], "pfm") == 0) + print_libpfm_events(NULL, raw_dump, long_desc_flag); else if ((sep = strchr(argv[i], ':')) != NULL) {int sep_idx;
@@ -120,6 +123,7 @@ int cmd_list(int argc, const char **argv)print_tracepoint_events (NULL , s, raw_dump);print_sdt_events (NULL , s, raw_dump);metricgroup__print (true, true, s, raw_dump, details_flag); +print_libpfm_events (s, raw_dump, long_desc_flag);free (s); } }
tools/perf/builtin-record.c +1 -1
@@ -2593,7 +2593,7 @@ static struct option __record_options[] = { "number of threads to run for event synthesis"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &record.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &record.opts, "fd:ctl-fd[,ack-fd]",
tools/perf/builtin-stat.c +1 -1
@@ -1166,7 +1166,7 @@ static struct option stat_options[] = { "threads of same physical core"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &evsel_list, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &stat_config, "fd:ctl-fd[,ack-fd]",
tools/perf/builtin-top.c +1 -1
@@ -1578,7 +1578,7 @@ int cmd_top(int argc, const char **argv) "Enable LBR callgraph stitching approach"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &top.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPTS_EVSWITCH(&top.evswitch),
tools/perf/util/parse-events.c +1 -1
@@ -2899,7 +2899,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,metricgroup__print (true, true,NULL , name_only, details_flag); -print_libpfm_events (name_only, long_desc); +print_libpfm_events (NULL , name_only, long_desc); }int parse_events__is_hardcoded_term (struct parse_events_term *term)
tools/perf/util/pfm.c +5 -1
@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h>
@@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;
@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ; +if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ; +if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;
tools/perf/util/pfm.h +3 -2
@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h>
@@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { }
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Namhyung Kim
maintainerRe: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
Hi all,
Can you please take a look at this?
Thanks
Namhyung
Quoted 174 lines · Namhyung Kim
Print libpfm4 events with 'perf list pfm' command like others. When libpfm4 support is not enabled, it'd print nothing. Also it support glob pattern matching for event name.
$ perf list pfmList of pre-defined events (to be used in --pfm-events):
ix86arch:
UNHALTED_CORE_CYCLES
[count core clock cycles whenever the clock signal ...
INSTRUCTION_RETIRED
[count the number of instructions at retirement. ...
...Signed-off-by Namhyung Kim <[email protected]>tools/perf/builtin-list.c +6
-2@@ -14,6 +14,7 @@#include "util/pmu.h" #include "util/debug.h" #include "util/metricgroup.h" +#include "util/pfm.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include <stdio.h> @@ -42,7 +43,7 @@ int cmd_list(int argc, const char **argv) OPT_END() };const char *const list_usage[] = { -"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|event_glob]" , +"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|pfm|event_glob]" ,NULL };@@ -53,7 +54,7 @@ int cmd_list(int argc, const char **argv)setup_pager (); -if (!raw_dump &&pager_in_use ()) +if (!raw_dump &&pager_in_use () && (argc !=1 ||strcmp (argv[0 ],"pfm" )))printf ("\nList of pre-defined events (to be used in -e):\n\n" );if (argc ==0 ) {@@ -89,6 +90,8 @@ int cmd_list(int argc, const char **argv)metricgroup__print (true, false,NULL , raw_dump, details_flag); else if (strcmp(argv[i], "metricgroup") == 0 || strcmp(argv[i], "metricgroups") == 0) metricgroup__print(false, true,NULL , raw_dump, details_flag); + else if (strcmp(argv[i], "pfm") == 0) + print_libpfm_events(NULL, raw_dump, long_desc_flag); else if ((sep = strchr(argv[i], ':')) != NULL) {int sep_idx;@@ -120,6 +123,7 @@ int cmd_list(int argc, const char **argv)print_tracepoint_events (NULL , s, raw_dump);print_sdt_events (NULL , s, raw_dump);metricgroup__print (true, true, s, raw_dump, details_flag); +print_libpfm_events (s, raw_dump, long_desc_flag);free (s); } }tools/perf/builtin-record.c +1
-1@@ -2593,7 +2593,7 @@ static struct option __record_options[] = { "number of threads to run for event synthesis"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &record.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &record.opts, "fd:ctl-fd[,ack-fd]",tools/perf/builtin-stat.c +1
-1@@ -1166,7 +1166,7 @@ static struct option stat_options[] = { "threads of same physical core"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &evsel_list, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &stat_config, "fd:ctl-fd[,ack-fd]",tools/perf/builtin-top.c +1
-1@@ -1578,7 +1578,7 @@ int cmd_top(int argc, const char **argv) "Enable LBR callgraph stitching approach"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &top.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPTS_EVSWITCH(&top.evswitch),tools/perf/util/parse-events.c +1
-1@@ -2899,7 +2899,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,metricgroup__print (true, true,NULL , name_only, details_flag); -print_libpfm_events (name_only, long_desc); +print_libpfm_events (NULL , name_only, long_desc); }int parse_events__is_hardcoded_term (struct parse_events_term *term)tools/perf/util/pfm.c +5
-1@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h> @@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ; +if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ; +if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;tools/perf/util/pfm.h +3
-3@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h> @@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { } --2.28.0.526.ge36021eeef-goog
Re: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
In reply to Namhyung KimOn Wed, Sep 09, 2020 at 02:58:49PM +0900, Namhyung Kim wrote:
SNIP
Quoted 23 lines
int
parse_events__is_hardcoded_term(struct parse_events_term *term)tools/perf/util/pfm.c +2
-1@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h> @@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;
tools/perf/util/pfm.c void print_libpfm_events(bool name_only, bool long_desc) · line 270
Quoted 5 lines
tools/perf/util/pfm.c +2
-0@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ; +if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ;
you could mentioned in changelog that it also enables glob matching for pfm events.. but other than then looks ok
Acked/Tested-by: Jiri Olsa <[email protected]>
thanks,
jirka
Quoted 30 lines
tools/perf/util/pfm.c +1
-0+if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;tools/perf/util/pfm.h +3
-2@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h> @@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { }Signature · 1 line
2.28.0.526.ge36021eeef-goog
Namhyung Kim
maintainerRe: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
Hi Jiri,
Quoted 31 lines · Jiri Olsa
On Wed, Sep 09, 2020 at 02:58:49PM +0900, Namhyung Kim wrote:
SNIP
Quoted 26 lines
int
parse_events__is_hardcoded_term(struct parse_events_term *term)tools/perf/util/pfm.c +2
-1@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h> @@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ;
Quoted 5 lines
tools/perf/util/pfm.c void print_libpfm_events(bool name_only, bool long_desc) · line 270
Quoted 2 lines
tools/perf/util/pfm.c +2
-0+if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ;you could mentioned in changelog that it also enables glob matching for pfm events.. but other than then looks ok
Well, I have mentioned it in the changelog.. :)
Do you want an example?
Quoted 2 lines
Acked/Tested-by: Jiri Olsa <[email protected]>
Thanks
Namhyung
Quoted 32 lines
Quoted 31 lines
tools/perf/util/pfm.c +1
-0+if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;tools/perf/util/pfm.h +3
-3@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h> @@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { } --2.28.0.526.ge36021eeef-goog
Re: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
Quoted 34 lines · Namhyung Kim
Hi Jiri,
Quoted 31 lines · Jiri Olsa
On Wed, Sep 09, 2020 at 02:58:49PM +0900, Namhyung Kim wrote:
SNIP
Quoted 26 lines
int
parse_events__is_hardcoded_term(struct parse_events_term *term)tools/perf/util/pfm.c +2
-1@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h> @@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ;
Quoted 8 lines
Quoted 5 lines
tools/perf/util/pfm.c void print_libpfm_events(bool name_only, bool long_desc) · line 270
Quoted 2 lines
tools/perf/util/pfm.c +2
-0+if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ;you could mentioned in changelog that it also enables glob matching for pfm events.. but other than then looks ok
Well, I have mentioned it in the changelog.. :)
Do you want an example?
ugh.. sry, overlooked that
jirka
Quoted 40 lines
Quoted 3 lines
Acked/Tested-by: Jiri Olsa <[email protected]>
Thanks
NamhyungQuoted 32 lines
Quoted 31 lines
tools/perf/util/pfm.c +1
-0+if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;tools/perf/util/pfm.h +3
-3@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h> @@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { } --2.28.0.526.ge36021eeef-goog
Ian Rogers
reviewerRe: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
In reply to Namhyung KimQuoted 31 lines · Namhyung Kim
Print libpfm4 events with 'perf list pfm' command like others. When libpfm4 support is not enabled, it'd print nothing. Also it support glob pattern matching for event name.
$ perf list pfmList of pre-defined events (to be used in --pfm-events):
ix86arch:
UNHALTED_CORE_CYCLES
[count core clock cycles whenever the clock signal ...
INSTRUCTION_RETIRED
[count the number of instructions at retirement. ...
...Signed-off-by Namhyung Kim <[email protected]>tools/perf/builtin-list.c +1
-0@@ -14,6 +14,7 @@#include "util/pmu.h" #include "util/debug.h" #include "util/metricgroup.h" +#include "util/pfm.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include <stdio.h>
tools/perf/builtin-list.c int cmd_list(int argc, const char **argv) · line 46
Quoted 5 lines
tools/perf/builtin-list.c +1
-1@@ -42,7 +43,7 @@ int cmd_list(int argc, const char **argv)OPT_END () };const char *const list_usage[] = { -"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|event_glob]" , +"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|pfm|event_glob]" ,
Should this be "#ifdef HAVE_LIBPFM" to avoid advertising pfm events when support isn't compiled in?
Thanks,
Ian
Quoted 138 lines
tools/perf/builtin-list.c +4
-1NULL };@@ -53,7 +54,7 @@ int cmd_list(int argc, const char **argv)setup_pager (); -if (!raw_dump &&pager_in_use ()) +if (!raw_dump &&pager_in_use () && (argc !=1 ||strcmp (argv[0 ],"pfm" )))printf ("\nList of pre-defined events (to be used in -e):\n\n" );if (argc ==0 ) {@@ -89,6 +90,8 @@ int cmd_list(int argc, const char **argv)metricgroup__print (true, false,NULL , raw_dump, details_flag); else if (strcmp(argv[i], "metricgroup") == 0 || strcmp(argv[i], "metricgroups") == 0) metricgroup__print(false, true,NULL , raw_dump, details_flag); + else if (strcmp(argv[i], "pfm") == 0) + print_libpfm_events(NULL, raw_dump, long_desc_flag); else if ((sep = strchr(argv[i], ':')) != NULL) {int sep_idx;@@ -120,6 +123,7 @@ int cmd_list(int argc, const char **argv)print_tracepoint_events (NULL , s, raw_dump);print_sdt_events (NULL , s, raw_dump);metricgroup__print (true, true, s, raw_dump, details_flag); +print_libpfm_events (s, raw_dump, long_desc_flag);free (s); } }tools/perf/builtin-record.c +1
-1@@ -2593,7 +2593,7 @@ static struct option __record_options[] = { "number of threads to run for event synthesis"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &record.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &record.opts, "fd:ctl-fd[,ack-fd]",tools/perf/builtin-stat.c +1
-1@@ -1166,7 +1166,7 @@ static struct option stat_options[] = { "threads of same physical core"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &evsel_list, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPT_CALLBACK(0, "control", &stat_config, "fd:ctl-fd[,ack-fd]",tools/perf/builtin-top.c +1
-1@@ -1578,7 +1578,7 @@ int cmd_top(int argc, const char **argv) "Enable LBR callgraph stitching approach"), #ifdef HAVE_LIBPFM OPT_CALLBACK(0, "pfm-events", &top.evlist, "event", - "libpfm4 event selector. use 'perf list' to list available events", + "libpfm4 event selector. use 'perf list pfm' to list available events", parse_libpfm_events_option), #endif OPTS_EVSWITCH(&top.evswitch),tools/perf/util/parse-events.c +1
-1@@ -2899,7 +2899,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,metricgroup__print (true, true,NULL , name_only, details_flag); -print_libpfm_events (name_only, long_desc); +print_libpfm_events (NULL , name_only, long_desc); }int parse_events__is_hardcoded_term (struct parse_events_term *term)tools/perf/util/pfm.c +5
-1@@ -12,6 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" #include "util/pfm.h" +#include "util/string2.h" #include <string.h> #include <linux/kernel.h> @@ -227,7 +228,7 @@ print_libpfm_events_raw(pfm_pmu_info_t *pinfo, pfm_event_info_t *info)printf ("%s::%s\n" , pinfo->name, info->name); } -void print_libpfm_events (bool name_only,bool long_desc) +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc) {pfm_event_info_t info;pfm_pmu_info_t pinfo;@@ -265,6 +266,9 @@ void print_libpfm_events(bool name_only, bool long_desc)if (ret !=PFM_SUCCESS )continue ; +if (event_glob && !strglobmatch_nocase (info.name, event_glob)) +continue ; +if (!name_only && !printed_pmu) {printf ("%s:\n" , pinfo.name); printed_pmu = true;tools/perf/util/pfm.h +3
-3@@ -13,7 +13,7 @@int parse_libpfm_events_option (const struct option *opt,const char *str,int unset); -void print_libpfm_events (bool name_only,bool long_desc); +void print_libpfm_events (const char *event_glob,bool name_only,bool long_desc);#else #include <linux/compiler.h> @@ -26,7 +26,8 @@ static inline int parse_libpfm_events_option(return 0 ; } -static inline void print_libpfm_events (bool name_only__maybe_unused , +static inline void print_libpfm_events (const char *event_glob__maybe_unused , +bool name_only__maybe_unused ,bool long_desc__maybe_unused ) { } --2.28.0.526.ge36021eeef-goog
Namhyung Kim
maintainerRe: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events
HI Ian,
Quoted 33 lines · Ian Rogers
Quoted 31 lines · Namhyung Kim
Print libpfm4 events with 'perf list pfm' command like others. When libpfm4 support is not enabled, it'd print nothing. Also it support glob pattern matching for event name.
$ perf list pfmList of pre-defined events (to be used in --pfm-events):
ix86arch:
UNHALTED_CORE_CYCLES
[count core clock cycles whenever the clock signal ...
INSTRUCTION_RETIRED
[count the number of instructions at retirement. ...
...Signed-off-by Namhyung Kim <[email protected]>tools/perf/builtin-list.c +1
-0@@ -14,6 +14,7 @@#include "util/pmu.h" #include "util/debug.h" #include "util/metricgroup.h" +#include "util/pfm.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include <stdio.h> @@ -42,7 +43,7 @@ int cmd_list(int argc, const char **argv)
Quoted 8 lines
tools/perf/builtin-list.c int cmd_list(int argc, const char **argv) · line 46
Quoted 5 lines
tools/perf/builtin-list.c +1
-1OPT_END () };const char *const list_usage[] = { -"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|event_glob]" , +"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|pfm|event_glob]" ,Should this be "#ifdef
HAVE_LIBPFM" to avoid advertising pfm events when support isn't compiled in?
I thought about that too, but it's a keyword and current code already handles it to print nothing, so I think it's ok to have.
Thanks
Namhyung
Arnaldo Carvalho de Melo
maintainerEm Wed, Sep 09, 2020 at 02:58:47PM +0900, Namhyung Kim escreveu:
Quoted 4 lines
The sep is already checked being not NULL. The code seems to be a leftover from some refactoring.
Signed-off-by Namhyung Kim <[email protected]>
There is a missing --- separator from the description to the patch, I had to add it so that 'git am' works on it, please check.
- Arnaldo
I.e. it should be right here:
---
Quoted 22 lines
tools/perf/builtin-list.c +0
-7@@ -92,13 +92,6 @@ int cmd_list(int argc, const char **argv)else if ((sep =strchr (argv[i],':' )) !=NULL ) {int sep_idx; -if (sep ==NULL ) { -print_events (argv[i], raw_dump, !desc_flag, - long_desc_flag, - details_flag, - deprecated); -continue ; - } sep_idx = sep - argv[i]; s =strdup (argv[i]);if (s ==NULL )Signature · 1 line
2.28.0.526.ge36021eeef-goog
Signature · 1 line
- Arnaldo
Namhyung Kim
maintainerHi Arnaldo,
Quoted 9 lines · Arnaldo Carvalho de Melo
Em Wed, Sep 09, 2020 at 02:58:47PM +0900, Namhyung Kim escreveu:
Quoted 4 lines
The sep is already checked being not NULL. The code seems to be a leftover from some refactoring.
Signed-off-by Namhyung Kim <[email protected]>There is a missing --- separator from the description to the patch, I had to add it so that 'git am' works on it, please check.
Hmm.. strange. I don't know why it's missed.. will double-check later.
Thanks
Namhyung
Quoted 33 lines
- Arnaldo
I.e. it should be right here:
---
Quoted 20 lines
tools/perf/builtin-list.c +0
-8@@ -92,13 +92,6 @@ int cmd_list(int argc, const char **argv)else if ((sep =strchr (argv[i],':' )) !=NULL ) {int sep_idx; -if (sep ==NULL ) { -print_events (argv[i], raw_dump, !desc_flag, - long_desc_flag, - details_flag, - deprecated); -continue ; - } sep_idx = sep - argv[i]; s =strdup (argv[i]);if (s ==NULL ) --Quoted 2 lines
2.28.0.526.ge36021eeef-goog
--
- Arnaldo