Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 090a22f5 authored by Yicong Yang's avatar Yicong Yang Committed by Greg Kroah-Hartman
Browse files

perf tools: Fix auto-complete on aarch64 



[ Upstream commit ffd1240e8f0814262ceb957dbe961f6e0aef1e7a ]

On aarch64 CPU related events are not under event_source/devices/cpu/events,
they're under event_source/devices/armv8_pmuv3_0/events on my machine.
Using current auto-complete script will generate below error:

  [root@localhost bin]# perf stat -e
  ls: cannot access '/sys/bus/event_source/devices/cpu/events': No such file or directory

Fix this by not testing /sys/bus/event_source/devices/cpu/events on
aarch64 machine.

Fixes: 74cd5815 ("perf tool: Improve bash command line auto-complete for multiple events with comma")
Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxarm@huawei.com
Cc: prime.zeng@hisilicon.com
Link: https://lore.kernel.org/r/20230207035057.43394-1-yangyicong@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5d32f3e9

tools/perf/perf-completion.sh

+8 −3
Original line number Diff line number Diff line
@@ -165,7 +165,12 @@ __perf_main () 


		local cur1=${COMP_WORDS[COMP_CWORD]}

		local raw_evts=$($cmd list --raw-dump)

		local arr s tmp result

		local arr s tmp result cpu_evts



		# aarch64 doesn't have /sys/bus/event_source/devices/cpu/events

		if [[ `uname -m` != aarch64 ]]; then

			cpu_evts=$(ls /sys/bus/event_source/devices/cpu/events)

		fi



		if [[ "$cur1" == */* && ${cur1#*/} =~ ^[A-Z] ]]; then

			OLD_IFS="$IFS"
@@ -183,9 +188,9 @@ __perf_main () 
				fi

			done



			evts=${result}" "$(ls /sys/bus/event_source/devices/cpu/events)

			evts=${result}" "${cpu_evts}

		else

			evts=${raw_evts}" "$(ls /sys/bus/event_source/devices/cpu/events)

			evts=${raw_evts}" "${cpu_evts}

		fi



		if [[ "$cur1" == , ]]; then