Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/amd-pstate: Fix broken paths to run workloads in amd-pstate-ut

In selftests/amd-pstate, tbench and gitsource microbenchmarks are
used to compare the performance with different governors. In current
implementation the relative path to run `amd_pstate_tracer.py` is broken.
Fix this by using absolute paths.

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

authored by

Swapnil Sapkal and committed by
Shuah Khan
27aabb2c 508934b5

+19 -12
+1 -2
tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
··· 30 30 import Gnuplot 31 31 from numpy import * 32 32 from decimal import * 33 - sys.path.append('../intel_pstate_tracer') 34 - #import intel_pstate_tracer 33 + sys.path.append(os.path.join(os.path.dirname(__file__), "..", "intel_pstate_tracer")) 35 34 import intel_pstate_tracer as ipt 36 35 37 36 __license__ = "GPL version 2"
+11 -6
tools/testing/selftests/amd-pstate/gitsource.sh
··· 1 - #!/bin/sh 1 + #!/bin/bash 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 4 4 # Testing and monitor the cpu desire performance, frequency, load, ··· 66 66 67 67 install_gitsource() 68 68 { 69 - if [ ! -d $git_name ]; then 69 + if [ ! -d $SCRIPTDIR/$git_name ]; then 70 + pushd $(pwd) > /dev/null 2>&1 71 + cd $SCRIPTDIR 70 72 printf "Download gitsource, please wait a moment ...\n\n" 71 73 wget -O $git_tar $gitsource_url > /dev/null 2>&1 72 74 73 75 printf "Tar gitsource ...\n\n" 74 76 tar -xzf $git_tar 77 + popd > /dev/null 2>&1 75 78 fi 76 79 } 77 80 ··· 82 79 run_gitsource() 83 80 { 84 81 echo "Launching amd pstate tracer for $1 #$2 tracer_interval: $TRACER_INTERVAL" 85 - ./amd_pstate_trace.py -n tracer-gitsource-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 & 82 + $TRACER -n tracer-gitsource-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 & 86 83 87 84 printf "Make and test gitsource for $1 #$2 make_cpus: $MAKE_CPUS\n" 88 - cd $git_name 89 - perf stat -a --per-socket -I 1000 -e power/energy-pkg/ /usr/bin/time -o ../$OUTFILE_GIT.time-gitsource-$1-$2.log make test -j$MAKE_CPUS > ../$OUTFILE_GIT-perf-$1-$2.log 2>&1 90 - cd .. 85 + BACKUP_DIR=$(pwd) 86 + pushd $BACKUP_DIR > /dev/null 2>&1 87 + cd $SCRIPTDIR/$git_name 88 + 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 89 + popd > /dev/null 2>&1 91 90 92 91 for job in `jobs -p` 93 92 do
+6 -3
tools/testing/selftests/amd-pstate/run.sh
··· 8 8 FILE_MAIN=DONE 9 9 fi 10 10 11 - source basic.sh 12 - source tbench.sh 13 - source gitsource.sh 11 + SCRIPTDIR=`dirname "$0"` 12 + TRACER=$SCRIPTDIR/../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py 13 + 14 + source $SCRIPTDIR/basic.sh 15 + source $SCRIPTDIR/tbench.sh 16 + source $SCRIPTDIR/gitsource.sh 14 17 15 18 # amd-pstate-ut only run on x86/x86_64 AMD systems. 16 19 ARCH=$(uname -m 2>/dev/null | sed -e 's/i.86/x86/' -e 's/x86_64/x86/')
+1 -1
tools/testing/selftests/amd-pstate/tbench.sh
··· 64 64 run_tbench() 65 65 { 66 66 echo "Launching amd pstate tracer for $1 #$2 tracer_interval: $TRACER_INTERVAL" 67 - ./amd_pstate_trace.py -n tracer-tbench-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 & 67 + $TRACER -n tracer-tbench-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 & 68 68 69 69 printf "Test tbench for $1 #$2 time_limit: $TIME_LIMIT procs_num: $PROCESS_NUM\n" 70 70 tbench_srv > /dev/null 2>&1 &