[PATCH v1 1/3] perf completion: Restrict completion of events to events

[PATCH v1 1/3] perf completion: Restrict completion of events to events

[Ian Rogers]

perf list will list libpfm4 events and metrics which aren't valid
options to the '-e' option. Restrict the events gathered so that
invalid ones aren't shown.

Before:
$ perf stat -e <tab><tab>
Display all 633 possibilities? (y or n)

After:
$ perf stat -e <tab><tab>
Display all 375 possibilities? (y or n)

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/perf-completion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 978249d7868c..40cfc30ad7ad 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -164,7 +164,7 @@ __perf_main ()
 		$prev_skip_opts == @(record|stat|top) ]]; then
 
 		local cur1=${COMP_WORDS[COMP_CWORD]}
-		local raw_evts=$($cmd list --raw-dump)
+		local raw_evts=$($cmd list --raw-dump hw sw cache tracepoint pmu sdt)
 		local arr s tmp result cpu_evts
 
 		# aarch64 doesn't have /sys/bus/event_source/devices/cpu/events
-- 
2.42.0.283.g2d96d420d3-goog

[PATCH v1 2/3] perf completion: Support completion of libpfm4 events

[Ian Rogers]

Use `perf list --raw-dump pfm` to support completion of libpfm4 events.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 40cfc30ad7ad..319ad724b97a 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -198,6 +198,10 @@ __perf_main ()
 		else
 			__perfcomp_colon "$evts" "$cur1"
 		fi
+	elif [[ $prev == @("--pfm-events") &&
+		$prev_skip_opts == @(record|stat|top) ]]; then
+	        local evts=$($cmd list --raw-dump pfm)
+		__perfcomp "$evts" "$cur"
 	else
 		# List subcommands for perf commands
 		if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
-- 
2.42.0.283.g2d96d420d3-goog

[PATCH v1 3/3] perf completion: Support completion of metrics/metricgroups

[Ian Rogers]

Allow metrics to expand for -M or --metrics options.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 319ad724b97a..f224d79b89e6 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -202,6 +202,10 @@ __perf_main ()
 		$prev_skip_opts == @(record|stat|top) ]]; then
 	        local evts=$($cmd list --raw-dump pfm)
 		__perfcomp "$evts" "$cur"
+	elif [[ $prev == @("-M"|"--metrics") &&
+		$prev_skip_opts == @(stat) ]]; then
+	        local metrics=$($cmd list --raw-dump metric metricgroup)
+		__perfcomp "$metrics" "$cur"
 	else
 		# List subcommands for perf commands
 		if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
-- 
2.42.0.283.g2d96d420d3-goog

Re: [PATCH v1 1/3] perf completion: Restrict completion of events to events

[Namhyung Kim]

On Tue, Sep 5, 2023 at 11:16 AM Ian Rogers <irogers@google.com> wrote:
>
> perf list will list libpfm4 events and metrics which aren't valid
> options to the '-e' option. Restrict the events gathered so that
> invalid ones aren't shown.
>
> Before:
> $ perf stat -e <tab><tab>
> Display all 633 possibilities? (y or n)
>
> After:
> $ perf stat -e <tab><tab>
> Display all 375 possibilities? (y or n)
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung

> ---
>  tools/perf/perf-completion.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
> index 978249d7868c..40cfc30ad7ad 100644
> --- a/tools/perf/perf-completion.sh
> +++ b/tools/perf/perf-completion.sh
> @@ -164,7 +164,7 @@ __perf_main ()
>                 $prev_skip_opts == @(record|stat|top) ]]; then
>
>                 local cur1=${COMP_WORDS[COMP_CWORD]}
> -               local raw_evts=$($cmd list --raw-dump)
> +               local raw_evts=$($cmd list --raw-dump hw sw cache tracepoint pmu sdt)
>                 local arr s tmp result cpu_evts
>
>                 # aarch64 doesn't have /sys/bus/event_source/devices/cpu/events
> --
> 2.42.0.283.g2d96d420d3-goog
>

Re: [PATCH v1 2/3] perf completion: Support completion of libpfm4 events

[Namhyung Kim]

On Tue, Sep 5, 2023 at 11:16 AM Ian Rogers <irogers@google.com> wrote:
>
> Use `perf list --raw-dump pfm` to support completion of libpfm4 events.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  tools/perf/perf-completion.sh | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
> index 40cfc30ad7ad..319ad724b97a 100644
> --- a/tools/perf/perf-completion.sh
> +++ b/tools/perf/perf-completion.sh
> @@ -198,6 +198,10 @@ __perf_main ()
>                 else
>                         __perfcomp_colon "$evts" "$cur1"
>                 fi
> +       elif [[ $prev == @("--pfm-events") &&
> +               $prev_skip_opts == @(record|stat|top) ]]; then
> +               local evts=$($cmd list --raw-dump pfm)
> +               __perfcomp "$evts" "$cur"
>         else
>                 # List subcommands for perf commands
>                 if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
> --
> 2.42.0.283.g2d96d420d3-goog
>

Re: [PATCH v1 3/3] perf completion: Support completion of metrics/metricgroups

[Namhyung Kim]

On Tue, Sep 5, 2023 at 11:16 AM Ian Rogers <irogers@google.com> wrote:
>
> Allow metrics to expand for -M or --metrics options.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  tools/perf/perf-completion.sh | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
> index 319ad724b97a..f224d79b89e6 100644
> --- a/tools/perf/perf-completion.sh
> +++ b/tools/perf/perf-completion.sh
> @@ -202,6 +202,10 @@ __perf_main ()
>                 $prev_skip_opts == @(record|stat|top) ]]; then
>                 local evts=$($cmd list --raw-dump pfm)
>                 __perfcomp "$evts" "$cur"
> +       elif [[ $prev == @("-M"|"--metrics") &&
> +               $prev_skip_opts == @(stat) ]]; then
> +               local metrics=$($cmd list --raw-dump metric metricgroup)
> +               __perfcomp "$metrics" "$cur"
>         else
>                 # List subcommands for perf commands
>                 if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
> --
> 2.42.0.283.g2d96d420d3-goog
>

Re: [PATCH v1 1/3] perf completion: Restrict completion of events to events

[Arnaldo Carvalho de Melo]

Em Tue, Sep 05, 2023 at 11:15:52AM -0700, Ian Rogers escreveu:
> perf list will list libpfm4 events and metrics which aren't valid
> options to the '-e' option. Restrict the events gathered so that
> invalid ones aren't shown.
> 
> Before:
> $ perf stat -e <tab><tab>
> Display all 633 possibilities? (y or n)
> 
> After:
> $ perf stat -e <tab><tab>
> Display all 375 possibilities? (y or n)


Thanks, tested and applied.

- Arnaldo

 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/perf-completion.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
> index 978249d7868c..40cfc30ad7ad 100644
> --- a/tools/perf/perf-completion.sh
> +++ b/tools/perf/perf-completion.sh
> @@ -164,7 +164,7 @@ __perf_main ()
>  		$prev_skip_opts == @(record|stat|top) ]]; then
>  
>  		local cur1=${COMP_WORDS[COMP_CWORD]}
> -		local raw_evts=$($cmd list --raw-dump)
> +		local raw_evts=$($cmd list --raw-dump hw sw cache tracepoint pmu sdt)
>  		local arr s tmp result cpu_evts
>  
>  		# aarch64 doesn't have /sys/bus/event_source/devices/cpu/events
> -- 
> 2.42.0.283.g2d96d420d3-goog
> 

-- 

- Arnaldo