Commit 73d398dd authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/nvme-perf: refactor preconditing step 



Move all related steps to common.sh/preconditioning() function
so that everything is in one place.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent b5069cd0

test/nvme/perf/common.sh

+9 −6
Original line number Diff line number Diff line
@@ -204,14 +204,16 @@ function create_fio_config(){ 
function preconditioning() {

	local dev_name=""

	local filename=""

	local i

	sed -i -e "\$a[preconditioning]" $BASE_DIR/config.fio

	local nvme_list



	HUGEMEM=8192 $ROOT_DIR/scripts/setup.sh

	cp $BASE_DIR/config.fio.tmp $BASE_DIR/config.fio

	echo "[Preconditioning]" >> $BASE_DIR/config.fio



	# Generate filename argument for FIO.

	# We only want to target NVMes not bound to nvme driver.

	# If they're still bound to nvme that means they were skipped by

	# setup.sh on purpose.

	local nvme_list

	nvme_list=$(get_disks nvme)

	for nvme in $nvme_list; do

		dev_name='trtype=PCIe traddr='${nvme//:/.}' ns=1'
@@ -219,7 +221,8 @@ function preconditioning(){ 
	done

	echo "** Preconditioning disks, this can take a while, depending on the size of disks."

	run_spdk_nvme_fio "nvme" --filename="$filename" --size=100% --loops=2 --bs=1M \

		--rw=write --iodepth=32

		--rw=write --iodepth=32 --output-format=normal

	rm -f $BASE_DIR/config.fio

}



function get_results(){

test/nvme/perf/run_perf.sh

+0 −3
Original line number Diff line number Diff line
@@ -41,10 +41,7 @@ NO_CORES_ARRAY=($CORES) 
NO_CORES=${#NO_CORES_ARRAY[@]}



if $PRECONDITIONING; then

	HUGEMEM=8192 $ROOT_DIR/scripts/setup.sh

	cp $BASE_DIR/config.fio.tmp $BASE_DIR/config.fio

	preconditioning

	rm -f $BASE_DIR/config.fio

fi



#Kernel Classic Polling ioengine parameters