Skip to content

Commit 27aabb2

Browse files
SSapkalshuahkh
authored andcommitted
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>
1 parent 508934b commit 27aabb2

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
import Gnuplot
3131
from numpy import *
3232
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"))
3534
import intel_pstate_tracer as ipt
3635

3736
__license__ = "GPL version 2"

tools/testing/selftests/amd-pstate/gitsource.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# SPDX-License-Identifier: GPL-2.0
33

44
# Testing and monitor the cpu desire performance, frequency, load,
@@ -66,25 +66,30 @@ post_clear_gitsource()
6666

6767
install_gitsource()
6868
{
69-
if [ ! -d $git_name ]; then
69+
if [ ! -d $SCRIPTDIR/$git_name ]; then
70+
pushd $(pwd) > /dev/null 2>&1
71+
cd $SCRIPTDIR
7072
printf "Download gitsource, please wait a moment ...\n\n"
7173
wget -O $git_tar $gitsource_url > /dev/null 2>&1
7274

7375
printf "Tar gitsource ...\n\n"
7476
tar -xzf $git_tar
77+
popd > /dev/null 2>&1
7578
fi
7679
}
7780

7881
# $1: governor, $2: loop
7982
run_gitsource()
8083
{
8184
echo "Launching amd pstate tracer for $1 #$2 tracer_interval: $TRACER_INTERVAL"
82-
./amd_pstate_trace.py -n tracer-gitsource-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 &
85+
$TRACER -n tracer-gitsource-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1 &
8386

8487
printf "Make and test gitsource for $1 #$2 make_cpus: $MAKE_CPUS\n"
85-
cd $git_name
86-
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
87-
cd ..
88+
BACKUP_DIR=$(pwd)
89+
pushd $BACKUP_DIR > /dev/null 2>&1
90+
cd $SCRIPTDIR/$git_name
91+
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
92+
popd > /dev/null 2>&1
8893

8994
for job in `jobs -p`
9095
do

tools/testing/selftests/amd-pstate/run.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ else
88
FILE_MAIN=DONE
99
fi
1010

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
1417

1518
# amd-pstate-ut only run on x86/x86_64 AMD systems.
1619
ARCH=$(uname -m 2>/dev/null | sed -e 's/i.86/x86/' -e 's/x86_64/x86/')

tools/testing/selftests/amd-pstate/tbench.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ post_clear_tbench()
6464
run_tbench()
6565
{
6666
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 &
6868

6969
printf "Test tbench for $1 #$2 time_limit: $TIME_LIMIT procs_num: $PROCESS_NUM\n"
7070
tbench_srv > /dev/null 2>&1 &

0 commit comments

Comments
 (0)