Commit ed2a57a3 authored by Karol Latecki's avatar Karol Latecki Committed by Jim Harris
Browse files

test/nvme_perf: add option for dpdk mem measurements 



Allow to dump DPDK mem stats mid-test.

Change-Id: I5769bca9b3b10eb9a4114c29ae112d82066511aa
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3374


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 67901d43

test/nvme/perf/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ function run_nvme_fio() { 


function run_bdevperf() {

	echo "** Running bdevperf test, this can take a while, depending on the run-time setting."

	$bdevperf_dir/bdevperf --json $testdir/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -m "[$CPUS_ALLOWED]"

	$bdevperf_dir/bdevperf --json $testdir/bdev.conf -q $IODEPTH -o $BLK_SIZE -w $RW -M $MIX -t $RUNTIME -m "[$CPUS_ALLOWED]" -r /var/tmp/spdk.sock

	sleep 1

}

test/nvme/perf/run_perf.sh

+23 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ NOIOSCALING=false 
PRECONDITIONING=true

CPUFREQ=""

PERFTOP=false

DPDKMEM=false

DATE="$(date +'%m_%d_%Y_%H%M%S')"



function usage() {
@@ -98,6 +99,7 @@ function usage() { 
	echo

	echo "Other options:"

	echo "    --perftop           Run perftop measurements on the same CPU cores as specified in --cpu-allowed option."

	echo "    --dpdk-mem-stats    Dump DPDK memory stats during the test."

	set -x

}
@@ -141,6 +143,7 @@ while getopts 'h-:' optchar; do 
				no-io-scaling) NOIOSCALING=true ;;

				cpu-frequency=*) CPUFREQ="${OPTARG#*=}" ;;

				perftop) PERFTOP=true ;;

				dpdk-mem-stats) DPDKMEM=true ;;

				*)

					usage $0 echo "Invalid argument '$OPTARG'"

					exit 1
@@ -166,7 +169,7 @@ echo "run-time,ramp-time,fio-plugin,QD,block-size,num-cpu-cores,workload,workloa 
printf "%s,%s,%s,%s,%s,%s,%s,%s\n" $RUNTIME $RAMP_TIME $PLUGIN $IODEPTH $BLK_SIZE $NO_CORES $RW $MIX >> $result_file

echo "num_of_disks,iops,avg_lat[usec],p99[usec],p99.99[usec],stdev[usec],avg_slat[usec],avg_clat[usec],bw[Kib/s]" >> $result_file



trap 'rm -f *.state $testdir/bdev.conf; kill $perf_pid; print_backtrace' ERR SIGTERM SIGABRT

trap 'rm -f *.state $testdir/bdev.conf; kill $perf_pid; wait $dpdk_mem_pid; print_backtrace' ERR SIGTERM SIGABRT



if [[ "$PLUGIN" =~ "bdev" ]]; then

	create_spdk_bdev_conf "$BDEV_CACHE" "$BDEV_POOL"
@@ -240,6 +243,20 @@ if $PERFTOP; then 
	perf_pid=$!

fi



if $DPDKMEM; then

	echo "INFO: waiting to generate DPDK memory usage"

	wait_time=$((RUNTIME / 2))

	if [[ ! "$PLUGIN" =~ "perf" ]]; then

		wait_time=$((wait_time + RAMP_TIME))

	fi

	(

		sleep $wait_time

		echo "INFO: generating DPDK memory usage"

		$rootdir/scripts/rpc.py env_dpdk_get_mem_stats

	) &

	dpdk_mem_pid=$!

fi



#Run each workolad $REPEAT_NO times

for ((j = 0; j < REPEAT_NO; j++)); do

	if [ $PLUGIN = "spdk-perf-bdev" ]; then
@@ -301,6 +318,11 @@ if $PERFTOP; then 
	rm -f "$testdir/perf.data"

fi



if $DPDKMEM; then

	mv "/tmp/spdk_mem_dump.txt" $result_dir/spdk_mem_dump_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}.txt

	echo "INFO: DPDK memory usage saved in $result_dir"

fi



#Write results to csv file

iops_disks=$((iops_disks / REPEAT_NO))

bw=$((bw / REPEAT_NO))