Skip to contentSkip to conversation

perf completion: Restrict completion of events to events

PATCH In review Ian Rogers 3 participants 7 messages Sep 5, 2023 – Sep 6, 2023 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/3 perf completion: Restrict completion of events to events

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)
---
 tools/perf/perf-completion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/perf-completion.sh +1 -1
index 978249d7868c..40cfc30ad7ad 100644
@@ -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
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
author reviewer
#1 lore raw

PATCH 2/3 perf completion: Support completion of libpfm4 events

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

---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/perf-completion.sh +4 -0
index 40cfc30ad7ad..319ad724b97a 100644
@@ -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|
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
maintainer Acked-by on v1 2/3
#2 lore raw

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

Quoted 4 lines · Ian Rogers

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

Thanks,
Namhyung

Quoted 22 lines
---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/perf-completion.sh +4 -1
index 40cfc30ad7ad..319ad724b97a 100644
@@ -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

author reviewer
#3 lore raw

PATCH 3/3 perf completion: Support completion of metrics/metricgroups

In reply to Ian Rogers

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

---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/perf-completion.sh +4 -0
index 319ad724b97a..f224d79b89e6 100644
@@ -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|
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
maintainer Acked-by on v1 3/3
#4 lore raw

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

Quoted 4 lines · Ian Rogers

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

Thanks,
Namhyung

Quoted 22 lines
---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/perf-completion.sh +4 -1
index 319ad724b97a..f224d79b89e6 100644
@@ -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

maintainer Acked-by on v1 1/3
#5 lore raw
In reply to Ian Rogers
Quoted 6 lines · 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:

Quoted 8 lines
$ 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,
Namhyung

Quoted 20 lines
---
 tools/perf/perf-completion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/perf-completion.sh +1 -2
index 978249d7868c..40cfc30ad7ad 100644
@@ -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

#6 lore raw
In reply to Ian Rogers

Em Tue, Sep 05, 2023 at 11:15:52AM -0700, Ian Rogers escreveu:

Quoted 11 lines

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

Quoted 21 lines
---
 tools/perf/perf-completion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/perf-completion.sh +1 -1
index 978249d7868c..40cfc30ad7ad 100644
@@ -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
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
Signature · 1 line
- Arnaldo