Commit c1d2bdfe authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

test/vhost: Add perf collection support 



Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: I059658c477be4122e7b04f33a796f732746b7c90
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15603


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 7c764edf

test/vhost/common.sh

+40 −0
Original line number Diff line number Diff line
@@ -1343,3 +1343,43 @@ function parse_irqs() { 
	mkdir -p "$VHOST_DIR/irqs/$iter"

	mv "$VHOST_DIR/irqs/"*.parsed "$VHOST_DIR/irqs/$iter/"

}



function collect_perf() {

	local cpus=$1 outf=$2 runtime=$3 delay=$4



	mkdir -p "$VHOST_DIR/perf"



	perf record -g \

		${cpus:+-C "$cpus"} \

		${outf:+-o "$outf"} \

		${delay:+-D $((delay * 1000))} \

		-z \

		${runtime:+ -- sleep $((runtime + delay))}

}



function parse_perf() {

	local iter=${1:-1}

	local report out



	mkdir -p "$VHOST_DIR/perf/$iter"

	shift



	for report in "$@" "$VHOST_DIR/perf/"*.perf; do

		[[ -f $report ]] || continue

		perf report \

			-n \

			-i "$report" \

			--header \

			--stdio > "$VHOST_DIR/perf/$iter/${report##*/}.parsed"

		cp "$report" "$VHOST_DIR/perf/$iter/"

	done

	rm "$VHOST_DIR/perf/"*.perf

}



function get_from_fio() {

	local opt=$1 conf=$2



	[[ -n $opt && -f $conf ]] || return 1



	awk -F= "/^$opt/{print \$2}" "$conf"

}

test/vhost/perf_bench/vhost_perf.sh

+16 −2
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ precond_fio_bin=$CONFIG_FIO_SOURCE_DIR/fio 
disk_map=""

enable_irq=0

irqs_pids=()

enable_perf=0

perf_cpus=""



disk_cfg_bdfs=()

disk_cfg_spdk_names=()
@@ -91,6 +93,7 @@ function usage() { 
	echo "    --iobuf-large-pool-count=INT   number of large buffers in the global pool"

	echo "-x                          set -x for script debug"

	echo "-i                          Collect IRQ stats from each VM"

	echo "-p                          Enable perf report collection hooked to vhost CPUs"

	exit 0

}
@@ -177,7 +180,7 @@ function create_spdk_controller() { 
	fi

}



while getopts 'xhi-:' optchar; do

while getopts 'xhip-:' optchar; do

	case "$optchar" in

		-)

			case "$OPTARG" in
@@ -214,6 +217,7 @@ while getopts 'xhi-:' optchar; do 
			x="-x"

			;;

		i) enable_irq=1 ;;

		p) enable_perf=1 ;;

		*) usage $0 "Invalid argument '$OPTARG'" ;;

	esac

done
@@ -492,15 +496,24 @@ for vm_num in $used_vms; do 
	((enable_irq == 1)) && lookup_dev_irqs "$vm_num"

done



# Gather perf stats only from the vhost cpus

perf_cpus=${vhost_reactor_mask//[\[\]]/}



# Run FIO traffic

for fio_job in ${fio_jobs//,/ }; do

	((enable_irq == 1)) && irqs $used_vms

	runtime=$(get_from_fio "runtime" "$fio_job")

	ramptime=$(get_from_fio "ramp_time" "$fio_job")

	fio_job_fname=$(basename $fio_job)

	fio_log_fname="${fio_job_fname%%.*}.log"

	for i in $(seq 1 $fio_iterations); do

		echo "Running FIO iteration $i for $fio_job_fname"

		run_fio $fio_bin --hide-results --job-file="$fio_job" --out="$VHOST_DIR/fio_results" --json $fio_disks $fio_gtod &

		fio_pid=$!

		if ((enable_perf == 1)); then

			collect_perf "$perf_cpus" "$VHOST_DIR/perf/report.perf" "$runtime" "$ramptime" &

			perf_pid=$!

		fi



		if $host_sar_enable || $vm_sar_enable; then

			pids=""
@@ -530,7 +543,7 @@ for fio_job in ${fio_jobs//,/ }; do 
			done

		fi



		wait $fio_pid

		wait $fio_pid $perf_pid

		mv $VHOST_DIR/fio_results/$fio_log_fname $VHOST_DIR/fio_results/$fio_log_fname.$i

		sleep 1

	done
@@ -539,6 +552,7 @@ for fio_job in ${fio_jobs//,/ }; do 


	parse_fio_results "$VHOST_DIR/fio_results" "$fio_log_fname"

	((enable_irq == 1)) && parse_irqs $((++iter))

	((enable_perf == 1)) && parse_perf $iter

done



notice "Shutting down virtual machines..."