From 531d223455a88c885d6c5f7b1d7e158c1079fbce Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Wed, 10 Jun 2009 12:05:17 -0700 Subject: [PATCH] dapltest: windows scripts updated Support added for provider specification and general simplification of internal workings. Signed-off-by: Stan Smith --- test/dapltest/scripts/dt-cli.bat | 135 +++++++++++++------------------ test/dapltest/scripts/dt-svr.bat | 9 +-- 2 files changed, 61 insertions(+), 83 deletions(-) diff --git a/test/dapltest/scripts/dt-cli.bat b/test/dapltest/scripts/dt-cli.bat index 9f2284a..9cbb202 100644 --- a/test/dapltest/scripts/dt-cli.bat +++ b/test/dapltest/scripts/dt-cli.bat @@ -30,15 +30,16 @@ if NOT EXIST %PF%\dapl2test.exe ( set DT=dapl2test.exe rem To debug dapl2test - use dapl2testd.exe with ibnic0v2d +rem setup DAPL provider name: translate shorthand name or use name from dat.conf. +rem if DAPL provider name is incorrect, DAPL will fail correctly. if "%1" == "" goto usage if "%1" == "ibal" set D=ibnic0v2 +if "%1" == "ibal0" set D=ibnic0v2 +if "%1" == "ibal1" set D=ibnic1v2 if "%1" == "scm" set D=ibnic0v2-scm if "%1" == "cma" set D=ibnic0v2-cma -if "%D%" == "" ( - echo Invalid DAPL Provider name '%1' ? - goto usage -) +if "%D%" == "" set D=%1 rem DaplTest server hostname if "%2" == "" goto usage @@ -48,7 +49,7 @@ rem Which test ? if "%3" == "" goto usage set T=%3 -set LPS=3 +set LPS=5 rem Enable DEBUG? @@ -64,6 +65,8 @@ rem set DAT_DBG_TYPE=0x1 rem set DAT_DBG_LEVEL=1 ) +if "%4" == "-Q" ( set QUIET=1 ) else ( set QUIET=0 ) + rem %DT% -T T -V -t 2 -w 2 -i 1000111 -s %S% -D %D% rem client RW 4096 1 server RW 2048 4 rem client RR 1024 2 server RR 2048 2 @@ -83,61 +86,47 @@ if "%T%" == "bench" ( ) if "%T%" == "conn" ( -rem Connectivity test - client sends one buffer with one 4KB segments, one time. -rem add '-d' for debug output. + rem Connectivity test - client sends one buffer with one 4KB segments, one time. + rem add '-d' for debug output. echo Simple Connectivity test - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 1 -t 1 -w 1 client SR 4096 server SR 4096 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 1 -t 1 -w 1 client SR 4096 server SR 4096 + goto xcmd ) if "%T%" == "trans" ( echo %T%: Transaction test - 8192 iterations, 1 thread, SR 4KB buffers - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 8192 -t 1 -w 1 client SR 4096 server SR 4096 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 8192 -t 1 -w 1 client SR 4096 server SR 4096 + goto xcmd ) if "%T%" == "transm" ( echo %T%: Multiple RW, RR, SR transactions, 4096 iterations - set STIME=!DATE! !TIME! - %DT% -T T -P -t 1 -w 1 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -P -t 1 -w 1 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f + goto xcmd ) if "%T%" == "transt" ( echo %T%: Threads[4] Transaction test - 4096 iterations, 1 thread, SR 4KB buffers - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 4096 -t 4 -w 1 client SR 8192 3 server SR 8192 3 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t 4 -w 1 client SR 8192 3 server SR 8192 3 + goto xcmd ) if "%T%" == "transme" ( echo %T%: 1 Thread Endpoints[4] transactions [RW, RR, SR], 4096 iterations - set STIME=!DATE! !TIME! - %DT% -T T -P -t 1 -w 4 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -P -t 1 -w 4 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f + goto xcmd ) if "%T%" == "transmet" ( echo %T%: Threads[2] Endpoints[4] transactions[RW, RR, SR], 4096 iterations - set STIME=!DATE! !TIME! - %DT% -T T -P -t 2 -w 4 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -P -t 2 -w 4 -i 4096 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f + goto xcmd ) if "%T%" == "transmete" ( echo %T%: Threads[4] Endpoints[4] transactions[RW, RR, SR], 8192 iterations - set STIME=!DATE! !TIME! - %DT% -T T -P -t 2 -w 4 -i 8192 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -P -t 2 -w 4 -i 8192 -s %S% -D %D% client RW 4096 1 server RW 2048 4 server RR 1024 2 client RR 2048 2 client SR 1024 3 -f server SR 256 3 -f + goto xcmd ) if "%T%" == "EPA" ( @@ -159,76 +148,58 @@ if "%T%" == "EP" ( set TH=4 set EP=3 echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3 + goto xcmd ) if "%T%" == "threads" ( echo %T%: Multi Threaded[6] Send/Recv test - 4096 iterations, 3 8K segs - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 1 client SR 8192 3 server SR 8192 3 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t 6 -w 1 client SR 8192 3 server SR 8192 3 + goto xcmd ) if "%T%" == "threadsm" ( set TH=5 set EP=3 echo %T%: Multi: Threads[!TH!] endpoints[!EP!] Send/Recv test - 4096 iterations, 3 8K segs - set STIME=!DATE! !TIME! - %DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T T -s %S% -D %D% -i 4096 -t !TH! -w !EP! client SR 8192 3 server SR 8192 3 + goto xcmd ) if "%T%" == "perf" ( rem echo Performance test - set STIME=!DATE! !TIME! - %DT% -T P %DBG% -s %S% -D %D% -i 2048 RW 4096 2 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P %DBG% -s %S% -D %D% -i 2048 RW 4096 2 + goto xcmd ) if "%T%" == "rdma-read" ( echo %T% 4 32K segs - set STIME=!DATE! !TIME! - %DT% -T P -s %S% -D %D% -i 4096 RR 32768 4 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P -s %S% -D %D% -i 4096 RR 32768 4 + goto xcmd ) if "%T%" == "rdma-write" ( echo %T% 4 32K segs - set STIME=!DATE! !TIME! - %DT% -T P -s %S% -D %D% -i 4096 RW 32768 4 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P -s %S% -D %D% -i 4096 RW 32768 4 + goto xcmd ) if "%T%" == "bw" ( echo bandwidth 4096 iterations of 2 65K mesgs - set STIME=!DATE! !TIME! - %DT% -T P -s %S% -D %D% -i 4096 -p 16 -m p RW 65536 2 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P -s %S% -D %D% -i 4096 -p 16 -m p RW 65536 2 + goto xcmd ) if "%T%" == "latb" ( echo latency test - block for completion events - set STIME=!DATE! !TIME! - %DT% -T P -s %S% -D %D% -i 8192 -p 1 -m b RW 4 1 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P -s %S% -D %D% -i 8192 -p 1 -m b RW 4 1 + goto xcmd ) if "%T%" == "latp" ( echo latency test - poll completion events - set STIME=!DATE! !TIME! - %DT% -T P -s %S% -D %D% -i 8192 -p 1 -m p RW 4 1 - set ETIME=!DATE! !TIME! - goto xit + set CMD=%DT% -T P -s %S% -D %D% -i 8192 -p 1 -m p RW 4 1 + goto xcmd ) if "%T%" == "lim" ( @@ -259,7 +230,7 @@ if "%T%" == "regression" ( FOR /L %%i IN (1,1,!LPS!) DO ( for %%r in ( !RT! ) do ( echo loop %%i - start test %%r - call %0 %1 %%r + call %0 %1 %2 %%r if %ERRORLEVEL% GTR 1 ( echo Error %ERRORLEVEL% in regression test %%r exit /B %ERRORLEVEL% @@ -337,10 +308,8 @@ if "%T%" == "interop" ( ) if "%T%" == "stop" ( - set STIME=!DATE! !TIME! - %DT% -T Q -s %S% -D %D% - set ETIME=!DATE! !TIME! - goto xit + %DT% -T Q -s %S% -D %D% > nul + goto rxt ) :usage @@ -350,7 +319,7 @@ echo usage: dt-cli dapl-provider dt-svr-hostname [testname [-D]] echo. echo where: echo. -echo dapl-provider - ibal scm cma +echo dapl-provider: ibal, scm, cma or %SystemDrive%\DAT\dat.conf DAPL-provider name. echo. echo dt-svr-hostname - IPv4 hostanme where the DaplTest server is running echo. @@ -378,6 +347,18 @@ echo regression {loopCnt,default=%LPS%} - regression + stress. echo interop {loopCnt,default=%LPS%} - 2007 OFA interoperability event tests. goto rxt +rem Execute the single daplest Command (CMD), observe -Q switch +:xcmd + set STIME=!DATE! !TIME! + if %QUIET% EQU 1 ( + %CMD% > nul + ) else ( + %CMD% + ) + set ETIME=!DATE! !TIME! + + rem fall thru... + :xit if %ERRORLEVEL% EQU 0 ( diff --git a/test/dapltest/scripts/dt-svr.bat b/test/dapltest/scripts/dt-svr.bat index a774aac..1d3760d 100644 --- a/test/dapltest/scripts/dt-svr.bat +++ b/test/dapltest/scripts/dt-svr.bat @@ -25,19 +25,16 @@ rem which Dapl provider? if "%1" == "" ( echo usage: dt-svr dapl-provider [ -D [dbg-bit-mask] ] echo. - echo Where: dapl-provider can be [ ibal, scm, cma ] + echo Where: dapl-provider can be [ ibal, scm, cma or %SystemDrive%\DAT\dat.conf provider name ] exit /B 1 ) if "%1" == "ibal" set DEV=ibnic0v2 if "%1" == "scm" set DEV=ibnic0v2-scm if "%1" == "cma" set DEV=ibnic0v2-cma -if "%DEV%" == "" ( - echo Invalid DAPL Provider name '%1', see %SystemDrive%\DAT\dat.conf ? - goto usage -) +if "%DEV%" == "" set DEV=%1 -rem '-D' enables full debug output +rem '-D' enables full debug output? rem '-D hex-bit-mask' enables selective debug output - see manual.htm for details. if "%2" == "-D" ( if "%2" == "" ( -- 2.46.0