selftests/amd-pstate: Added option to provide perf binary path

In selftests/amd-pstate, distro `perf` is used to capture `perf stat`
while running microbenchmarks. Distro `perf` is not working with
upstream kernel. Fix this by providing an option to give the perf
binary path.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Swapnil Sapkal <swapnil.sapkal@amd.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/amd-pstate/gitsource.sh b/tools/testing/selftests/amd-pstate/gitsource.sh
index ab195ddcba4d0ad431662f2ca2b29d3ddb153522..4cde62f90468060592913ba1b4cb656d3609a975 100755 (executable)
--- a/tools/testing/selftests/amd-pstate/gitsource.sh
+++ b/tools/testing/selftests/amd-pstate/gitsource.sh
@@ -88,7 +88,7 @@ run_gitsource()
        BACKUP_DIR=$(pwd)
        pushd $BACKUP_DIR > /dev/null 2>&1
        cd $SCRIPTDIR/$git_name
-       perf stat -a --per-socket -I 1000 -e power/energy-pkg/ /usr/bin/time -o $BACKUP_DIR/$OUTFILE_GIT.time-gitsource-$1-$2.log make test -j$MAKE_CPUS > $BACKUP_DIR/$OUTFILE_GIT-perf-$1-$2.log 2>&1
+       $PERF stat -a --per-socket -I 1000 -e power/energy-pkg/ /usr/bin/time -o $BACKUP_DIR/$OUTFILE_GIT.time-gitsource-$1-$2.log make test -j$MAKE_CPUS > $BACKUP_DIR/$OUTFILE_GIT-perf-$1-$2.log 2>&1
        popd > /dev/null 2>&1
 
        for job in `jobs -p`

diff --git a/tools/testing/selftests/amd-pstate/run.sh b/tools/testing/selftests/amd-pstate/run.sh
index 279d073c5728222143e8dcdf0499ba7db7684197..b053eea8bb19ca42fc9739331908409ebee8adb7 100755 (executable)
--- a/tools/testing/selftests/amd-pstate/run.sh
+++ b/tools/testing/selftests/amd-pstate/run.sh
@@ -25,6 +25,7 @@ OUTFILE=selftest
 OUTFILE_TBENCH="$OUTFILE.tbench"
 OUTFILE_GIT="$OUTFILE.gitsource"
 
+PERF=/usr/bin/perf
 SYSFS=
 CPUROOT=
 CPUFREQROOT=
@@ -154,6 +155,7 @@ help()
        [-p <tbench process number>]
        [-l <loop times for tbench>]
        [-i <amd tracer interval>]
+       [-b <perf binary>]
        [-m <comparative test: acpi-cpufreq>]
        \n"
        exit 2
@@ -161,7 +163,7 @@ help()
 
 parse_arguments()
 {
-       while getopts ho:c:t:p:l:i:m: arg
+       while getopts ho:c:t:p:l:i:b:m: arg
        do
                case $arg in
                        h) # --help
@@ -192,6 +194,10 @@ parse_arguments()
                                TRACER_INTERVAL=$OPTARG
                                ;;
 
+                       b) # --perf-binary
+                               PERF=`realpath $OPTARG`
+                               ;;
+
                        m) # --comparative-test
                                COMPARATIVE_TEST=$OPTARG
                                ;;
@@ -205,8 +211,8 @@ parse_arguments()
 
 command_perf()
 {
-       if ! command -v perf > /dev/null; then
-               echo $msg please install perf. >&2
+       if ! $PERF -v; then
+               echo $msg please install perf or provide perf binary path as argument >&2
                exit $ksft_skip
        fi
 }

diff --git a/tools/testing/selftests/amd-pstate/tbench.sh b/tools/testing/selftests/amd-pstate/tbench.sh
index 4d2e8ce2da3b4d5805060b938fba942165ec8cda..2a98d9c9202ed105784f14030f54cdc7efbc1278 100755 (executable)
--- a/tools/testing/selftests/amd-pstate/tbench.sh
+++ b/tools/testing/selftests/amd-pstate/tbench.sh
@@ -68,7 +68,7 @@ run_tbench()
 
        printf "Test tbench for $1 #$2 time_limit: $TIME_LIMIT procs_num: $PROCESS_NUM\n"
        tbench_srv > /dev/null 2>&1 &
-       perf stat -a --per-socket -I 1000 -e power/energy-pkg/ tbench -t $TIME_LIMIT $PROCESS_NUM > $OUTFILE_TBENCH-perf-$1-$2.log 2>&1
+       $PERF stat -a --per-socket -I 1000 -e power/energy-pkg/ tbench -t $TIME_LIMIT $PROCESS_NUM > $OUTFILE_TBENCH-perf-$1-$2.log 2>&1
 
        pid=`pidof tbench_srv`
        kill $pid