| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <YtX5Y2jnVCf0uW1+@amd.com>
Date: Tue, 19 Jul 2022 08:22:59 +0800
From: Huang Rui <ray.huang@....com>
To: "Meng, Li (Jassmine)" <Li.Meng@....com>
Cc: Shuah Khan <skhan@...uxfoundation.org>,
"linux-pm@...r.kernel.org" <linux-pm@...r.kernel.org>,
"Rafael J . Wysocki" <rafael.j.wysocki@...el.com>,
"Fontenot, Nathan" <Nathan.Fontenot@....com>,
"Sharma, Deepak" <Deepak.Sharma@....com>,
"Deucher, Alexander" <Alexander.Deucher@....com>,
"Limonciello, Mario" <Mario.Limonciello@....com>,
"Su, Jinzhou (Joe)" <Jinzhou.Su@....com>,
"Yuan, Perry" <Perry.Yuan@....com>,
"Du, Xiaojian" <Xiaojian.Du@....com>,
Viresh Kumar <viresh.kumar@...aro.org>,
Borislav Petkov <bp@...en8.de>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH V1 3/4] selftests: amd-pstate: Trigger gitsource
benchmark and test cpus
On Wed, Jul 06, 2022 at 03:36:21PM +0800, Meng, Li (Jassmine) wrote:
> Add gitsource.sh trigger the gitsource testing and monitor the cpu desire
> performance, frequency, load, power consumption and throughput etc.
>
> Signed-off-by: Meng Li <li.meng@....com>
> ---
> tools/testing/selftests/amd-pstate/Makefile | 2 +-
> .../testing/selftests/amd-pstate/gitsource.sh | 176 ++++++++++++++++++
> tools/testing/selftests/amd-pstate/main.sh | 21 ++-
> 3 files changed, 195 insertions(+), 4 deletions(-)
> create mode 100755 tools/testing/selftests/amd-pstate/gitsource.sh
>
> diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile
> index e2fb03381a32..c536b9303858 100644
> --- a/tools/testing/selftests/amd-pstate/Makefile
> +++ b/tools/testing/selftests/amd-pstate/Makefile
> @@ -13,6 +13,6 @@ TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
> endif
>
> TEST_PROGS := run.sh
> -TEST_FILES := main.sh basic.sh tbench.sh
> +TEST_FILES := main.sh basic.sh tbench.sh gitsource.sh
>
> include ../lib.mk
> diff --git a/tools/testing/selftests/amd-pstate/gitsource.sh b/tools/testing/selftests/amd-pstate/gitsource.sh
> new file mode 100755
> index 000000000000..0631a4839f5d
> --- /dev/null
> +++ b/tools/testing/selftests/amd-pstate/gitsource.sh
> @@ -0,0 +1,176 @@
> +#!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> +
> +# Testing and monitor the cpu frequency and performance when
> +# this script trigger gitsource test.
> +
> +# protect against multiple inclusion
> +if [ $FILE_GITSOURCE ]; then
> + return 0
> +else
> + FILE_GITSOURCE=DONE
> +fi
> +
> +git_name="git-2.15.1"
> +git_tar="$git_name.tar.gz"
> +gitsource_url="https://github.com/git/git/archive/refs/tags/v2.15.1.tar.gz"
> +gitsource_governors=("ondemand" "schedutil")
> +
> +# $1: governor, $2: round, $3: des-perf, $4: freq, $5: load, $6: time $7: energy, $8: PPW
> +store_csv_gitsource()
> +{
> + echo "$1, $2, $3, $4, $5, $6, $7, $8" | tee -a $OUTFILE_GIT.csv > /dev/null 2>&1
> +}
> +
> +empty_line_csv_gitsource()
> +{
> + echo "" | tee -a $OUTFILE_GIT.csv > /dev/null 2>&1
> +}
> +
> +pre_clear_gitsource()
> +{
> + rm -rf results/tracer-gitsource*
> +}
> +
> +post_clear_gitsource()
> +{
> + rm -rf results/tracer-gitsource*
> + rm -rf $OUTFILE_GIT*.log
> +}
> +
> +install_gitsource()
> +{
> + if [ ! -d $git_name ]; then
> + printf "Download gitsource, please wait a moment ...\n\n"
> + wget -O $git_tar $gitsource_url > /dev/null 2>&1
> +
> + printf "Tar gitsource ...\n\n"
> + tar -xzf $git_tar
> + fi
> +}
> +
> +# $1: governor, $2: loop
> +run_gitsource()
> +{
> + echo "Launching amd pstate tracer for $1 #$2 tracer_interval: $TRACER_INTERVAL"
> + ./amd_pstate_trace.py -n tracer-gitsource-$1-$2 -i $TRACER_INTERVAL > /dev/null 2>&1
> +
> + printf "Make and test gitsource for $1 #$2 make_cpus: $MAKE_CPUS\n"
> + cd $git_name
> + ./../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
> + cd ..
> +
> + for job in `jobs -p`
> + do
> + echo "Waiting for job id $job"
> + wait $job
> + done
> +}
> +
> +# $1: governor, $2: loop
> +parse_gitsource()
> +{
> + awk '{print $5}' results/tracer-gitsource-$1-$2/cpu.csv | sed -e '1d' | sed s/,// > $OUTFILE_GIT-des-perf-$1-$2.log
> + avg_des_perf=$(awk 'BEGIN {i=0; sum=0};{i++; sum += $1};END {print sum/i}' $OUTFILE_GIT-des-perf-$1-$2.log)
> + printf "Gitsource-$1-#$2 avg des perf: $avg_des_perf\n" | tee -a $OUTFILE_GIT.result
> +
> + awk '{print $7}' results/tracer-gitsource-$1-$2/cpu.csv | sed -e '1d' | sed s/,// > $OUTFILE_GIT-freq-$1-$2.log
> + avg_freq=$(awk 'BEGIN {i=0; sum=0};{i++; sum += $1};END {print sum/i}' $OUTFILE_GIT-freq-$1-$2.log)
> + printf "Gitsource-$1-#$2 avg freq: $avg_freq\n" | tee -a $OUTFILE_GIT.result
> +
> + awk '{print $11}' results/tracer-gitsource-$1-$2/cpu.csv | sed -e '1d' | sed s/,// > $OUTFILE_GIT-load-$1-$2.log
> + avg_load=$(awk 'BEGIN {i=0; sum=0};{i++; sum += $1};END {print sum/i}' $OUTFILE_GIT-load-$1-$2.log)
> + printf "Gitsource-$1-#$2 avg load: $avg_load\n" | tee -a $OUTFILE_GIT.result
> +
> + grep user $OUTFILE_GIT.time-gitsource-$1-$2.log | awk '{print $1}' | sed -e 's/user//' > $OUTFILE_GIT-time-$1-$2.log
> + time_sum=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum}' $OUTFILE_GIT-time-$1-$2.log)
> + printf "Gitsource-$1-#$2 user time(s): $time_sum\n" | tee -a $OUTFILE_GIT.result
> +
> + grep Joules $OUTFILE_GIT-perf-$1-$2.log | awk '{print $4}' > $OUTFILE_GIT-energy-$1-$2.log
> + en_sum=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum}' $OUTFILE_GIT-energy-$1-$2.log)
> + printf "Gitsource-$1-#$2 power consumption(J): $en_sum\n" | tee -a $OUTFILE_GIT.result
> +
> + ppw=`echo "scale=4;$time_sum/$en_sum" | bc | awk '{printf "%.4f", $0}'`
> + printf "Gitsource-$1-#$2 PPW(s/J): $ppw\n" | tee -a $OUTFILE_GIT.result
> + printf "\n" | tee -a $OUTFILE_GIT.result
> +
> + store_csv_gitsource $1 $2 $avg_des_perf $avg_freq $avg_load $time_sum $en_sum $ppw
> +}
> +
> +# $1: governor:w
> +
> +loop_gitsource()
> +{
> + printf "\nGitsource total test times is $LOOP_TIMES for $1\n\n"
> + for i in `seq 1 $LOOP_TIMES`
> + do
> + run_gitsource $1 $i
> + parse_gitsource $1 $i
> + done
> +}
> +
> +# $1: governor
> +gather_gitsource()
> +{
> + printf "Gitsource test result for $1 (loops:$LOOP_TIMES)" | tee -a $OUTFILE_GIT.result
> + printf "\n--------------------------------------------------\n" | tee -a $OUTFILE_GIT.result
> +
> + grep "Gitsource-$1-#" $OUTFILE_GIT.result | grep "avg des perf:" | awk '{print $NF}' > $OUTFILE_GIT-des-perf-$1.log
> + avg_des_perf=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum/'$LOOP_TIMES'}' $OUTFILE_GIT-des-perf-$1.log)
> + printf "Gitsource-$1 avg des perf: $avg_des_perf\n" | tee -a $OUTFILE_GIT.result
> +
> + grep "Gitsource-$1-#" $OUTFILE_GIT.result | grep "avg freq:" | awk '{print $NF}' > $OUTFILE_GIT-freq-$1.log
> + avg_freq=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum/'$LOOP_TIMES'}' $OUTFILE_GIT-freq-$1.log)
> + printf "Gitsource-$1 avg freq: $avg_freq\n" | tee -a $OUTFILE_GIT.result
> +
> + grep "Gitsource-$1-#" $OUTFILE_GIT.result | grep "avg load:" | awk '{print $NF}' > $OUTFILE_GIT-load-$1.log
> + avg_load=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum/'$LOOP_TIMES'}' $OUTFILE_GIT-load-$1.log)
> + printf "Gitsource-$1 avg load: $avg_load\n" | tee -a $OUTFILE_GIT.result
> +
> + grep "Gitsource-$1-#" $OUTFILE_GIT.result | grep "user time(s):" | awk '{print $NF}' > $OUTFILE_GIT-time-$1.log
> + time_sum=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum}' $OUTFILE_GIT-time-$1.log)
> + printf "Gitsource-$1 total user time(s): $time_sum\n" | tee -a $OUTFILE_GIT.result
> +
> + avg_time=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum/'$LOOP_TIMES'}' $OUTFILE_GIT-time-$1.log)
> + printf "Gitsource-$1 avg user times(s): $avg_time\n" | tee -a $OUTFILE_GIT.result
> +
> + grep "Gitsource-$1-#" $OUTFILE_GIT.result | grep "power consumption(J):" | awk '{print $NF}' > $OUTFILE_GIT-energy-$1.log
> + en_sum=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum}' $OUTFILE_GIT-energy-$1.log)
> + printf "Gitsource-$1 total power consumption(J): $en_sum\n" | tee -a $OUTFILE_GIT.result
> +
> + avg_en=$(awk 'BEGIN {sum=0};{sum += $1};END {print sum/'$LOOP_TIMES'}' $OUTFILE_GIT-energy-$1.log)
> + printf "Gitsource-$1 avg power consumption(J): $avg_en\n" | tee -a $OUTFILE_GIT.result
> +
> + ppw=`echo "scale=4;$avg_time/$avg_en" | bc | awk '{printf "%.4f", $0}'`
> + printf "Gitsource-$1 PPW(s/J): $ppw\n" | tee -a $OUTFILE_GIT.result
> + printf "\n" | tee -a $OUTFILE_GIT.result
The same commment that last patch, we would better have a decription for
formula to caculate the performance per watt data here.
> +
> + store_csv_gitsource $1 "Average" $avg_des_perf $avg_freq $avg_load $avg_time $avg_en $ppw
> + empty_line_csv_gitsource
> +}
> +
> +amd_pstate_gitsource()
> +{
> + printf "\n---------------------------------------------\n"
> + printf "*** Running AMD P-state gitsource ***"
> + printf "\n---------------------------------------------\n"
> +
> + pre_clear_gitsource
> +
> + install_gitsource
> +
> + store_csv_gitsource "Governor" "Round" "Des-perf" "Freq" "Load" "Time(s)" "Energy(Joules)" "PPW(s/J)"
Clarify the full name of PPW.
> +
> + for_each_policy backup_governor
> +
> + for governor in ${gitsource_governors[*]} ; do
> + printf "\nSpecified governor is $governor\n\n"
> + for_each_policy switch_governor $governor
> + loop_gitsource $governor
> + gather_gitsource $governor
> + done
> +
> + restore_governor
> +
> + post_clear_gitsource
> +}
> diff --git a/tools/testing/selftests/amd-pstate/main.sh b/tools/testing/selftests/amd-pstate/main.sh
> index ae71fe62e3b0..69bf8ea371a5 100755
> --- a/tools/testing/selftests/amd-pstate/main.sh
> +++ b/tools/testing/selftests/amd-pstate/main.sh
> @@ -10,6 +10,7 @@ fi
>
> source basic.sh
> source tbench.sh
> +source gitsource.sh
>
> # amd-pstate-ut only run on x86/x86_64 AMD systems.
> ARCH=$(uname -m 2>/dev/null | sed -e 's/i.86/x86/' -e 's/x86_64/x86/')
> @@ -18,6 +19,7 @@ VENDOR=$(cat /proc/cpuinfo | grep -m 1 'vendor_id' | awk '{print $NF}')
> FUNC=all
> OUTFILE=selftest
> OUTFILE_TBENCH="$OUTFILE.tbench"
> +OUTFILE_GIT="$OUTFILE.gitsource"
>
> SYSFS=
> CPUROOT=
> @@ -126,6 +128,9 @@ amd_pstate_all()
>
> # tbench
> amd_pstate_tbench
> +
> + # gitsource
> + amd_pstate_gitsource
> }
>
> helpme()
> @@ -135,7 +140,8 @@ helpme()
> [-o <output-file-for-dump>]
> [-c <all: All testing,
> basic: Basic testing,
> - tbench: Tbench testing.>]
> + tbench: Tbench testing,
> + gitsource: Gitsource testing.>]
> [-t <tbench time limit>]
> [-p <tbench process number>]
> [-l <loop times for tbench]
Can we add an option to draw the chart of each times of performance and
energy/power data? It's absolutely better than raw table.
Thanks,
Ray
> @@ -153,7 +159,7 @@ parse_arguments()
> helpme
> ;;
>
> - c) # --func_type (Function to perform: basic, tbench (default: all))
> + c) # --func_type (Function to perform: basic, tbench, gitsource (default: all))
> FUNC=$OPTARG
> ;;
>
> @@ -169,7 +175,7 @@ parse_arguments()
> PROCESS_NUM=$OPTARG
> ;;
>
> - l) # --tbench-loop-times
> + l) # --tbench/gitsource-loop-times
> LOOP_TIMES=$OPTARG
> ;;
>
> @@ -259,6 +265,10 @@ do_test()
> amd_pstate_tbench
> ;;
>
> + "gitsource")
> + amd_pstate_gitsource
> + ;;
> +
> *)
> echo "Invalid [-f] function type"
> helpme
> @@ -283,6 +293,11 @@ pre_clear_dumps()
> rm -rf $OUTFILE_TBENCH*
> ;;
>
> + "gitsource")
> + rm -rf $OUTFILE.log
> + rm -rf $OUTFILE.backup_governor.log
> + rm -rf $OUTFILE_GIT*
> + ;;
> esac
> }
>
> --
> 2.25.1
>
Powered by blists - more mailing lists