d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/nvme: use stub to accelerate test time

Browse Source 
For now, just hardcode the shm_id to 0 for any test apps
that currently do not support command-line arguments.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ic8de44d4badc4c9b8858596b7f55dcc04371371b

Reviewed-on: https://review.gerrithub.io/365732
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Jim Harris 2017-06-15 16:29:35 -07:00 committed by Daniel Verkamp
parent d939572ab3
commit 5dff1923b6
6 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/nvme/hello_world/hello_world.c
View File

@ -316,6 +316,7 @@ int main(int argc, char **argv)
*/
spdk_env_opts_init(&opts);
opts.name = "hello_world";
opts.shm_id = 0;
spdk_env_init(&opts);
printf("Initializing NVMe Controllers\n");

1
examples/nvme/reserve/reserve.c
View File

@ -407,6 +407,7 @@ int main(int argc, char **argv)
spdk_env_opts_init(&opts);
opts.name = "reserve";
opts.core_mask = "0x1";
opts.shm_id = 0;
spdk_env_init(&opts);
if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, NULL) != 0) {

1
test/lib/nvme/e2edp/nvme_dp.c
View File

@ -633,6 +633,7 @@ int main(int argc, char **argv)
spdk_env_opts_init(&opts);
opts.name = "nvme_dp";
opts.core_mask = "0x1";
opts.shm_id = 0;
spdk_env_init(&opts);
printf("NVMe Write/Read with End-to-End data protection test\n");

39
test/lib/nvme/nvme.sh
View File

@ -12,6 +12,11 @@ function linux_iter_pci {
timing_enter nvme
if [ `uname` = Linux ]; then
start_stub "-s 2048 -i 0 -m 0xF"
trap "kill_stub; exit 1" SIGINT SIGTERM ExIT
fi
if [ $RUN_NIGHTLY -eq 1 ]; then
timing_enter aer
$testdir/aer/aer
@ -23,14 +28,14 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
fi
timing_enter identify
$rootdir/examples/nvme/identify/identify
$rootdir/examples/nvme/identify/identify -i 0
for bdf in $(linux_iter_pci 0108); do
$rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:${bdf}"
$rootdir/examples/nvme/identify/identify -r "trtype:PCIe traddr:${bdf}" -i 0
done
timing_exit identify
timing_enter perf
$rootdir/examples/nvme/perf/perf -q 128 -w read -s 12288 -t 1 -LL
$rootdir/examples/nvme/perf/perf -q 128 -w read -s 12288 -t 1 -LL -i 0
timing_exit perf
timing_enter reserve
@ -41,10 +46,26 @@ timing_enter hello_world
$rootdir/examples/nvme/hello_world/hello_world
timing_exit
timing_enter sgl
$testdir/sgl/sgl
timing_exit sgl
timing_enter e2edp
$testdir/e2edp/nvme_dp
timing_exit e2edp
timing_enter overhead
$rootdir/test/lib/nvme/overhead/overhead -s 4096 -t 1 -H
timing_exit overhead
timing_enter arbitration
$rootdir/examples/nvme/arbitration/arbitration -t 3 -i 0
timing_exit arbitration
if [ `uname` = Linux ]; then
trap - SIGINT SIGTERM EXIT
kill_stub
fi
PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
if [ -d /usr/src/fio ]; then
@ -57,10 +78,6 @@ if [ -d /usr/src/fio ]; then
timing_exit fio_plugin
fi
timing_enter arbitration
$rootdir/examples/nvme/arbitration/arbitration -t 3
timing_exit arbitration
if [ $(uname -s) = Linux ] && [ $SPDK_TEST_NVME_MULTIPROCESS -eq 1 ]; then
timing_enter multi_process
$rootdir/examples/nvme/arbitration/arbitration -i 0 -s 4096 -t 10 -c 0xf &
@ -86,12 +103,4 @@ if [ $(uname -s) = Linux ] && [ $SPDK_TEST_NVME_MULTIPROCESS -eq 1 ]; then
timing_exit multi_process
fi
timing_enter sgl
$testdir/sgl/sgl
timing_exit sgl
timing_enter e2edp
$testdir/e2edp/nvme_dp
timing_exit e2edp
timing_exit nvme

1
test/lib/nvme/overhead/overhead.c
View File

@ -621,6 +621,7 @@ int main(int argc, char **argv)
spdk_env_opts_init(&opts);
opts.name = "overhead";
opts.core_mask = "0x1";
opts.shm_id = 0;
spdk_env_init(&opts);
rc = parse_args(argc, argv);

1
test/lib/nvme/sgl/sgl.c
View File

@ -475,6 +475,7 @@ int main(int argc, char **argv)
spdk_env_opts_init(&opts);
opts.name = "nvme_sgl";
opts.core_mask = "0x1";
opts.shm_id = 0;
spdk_env_init(&opts);
printf("NVMe Readv/Writev Request test\n");