Re: [PATCH 3/3] perf list: Add 'pfm' to list libpfm4 events

[Jiri Olsa]

On Wed, Sep 09, 2020 at 02:58:49PM +0900, Namhyung Kim wrote:

SNIP

>  int parse_events__is_hardcoded_term(struct parse_events_term *term)
> diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c
> index d735acb6c29c..26ae2c8c0932 100644
> --- a/tools/perf/util/pfm.c
> +++ b/tools/perf/util/pfm.c
> @@ -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;

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 <jolsa@xxxxxxxxxx>

thanks,
jirka


> +
>  			if (!name_only && !printed_pmu) {
>  				printf("%s:\n", pinfo.name);
>  				printed_pmu = true;
> diff --git a/tools/perf/util/pfm.h b/tools/perf/util/pfm.h
> index 7d70dda87012..036e2d97b260 100644
> --- a/tools/perf/util/pfm.h
> +++ b/tools/perf/util/pfm.h
> @@ -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
>