Merge pull request #322 from bssrikanth/tbench_changes

[lkp-tests PATCHv1] Fix tbench issues
intel · Nov 8, 2023 · c0ca615 · c0ca615
2 parents 614be68 + fffb339
commit c0ca615
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 12 deletions.
diff --git a/distro/adaptation/centos b/distro/adaptation/centos
@@ -131,7 +131,6 @@ libssl: openssl-devel
 libssl-dev: openssl-devel
 libstdc++6: libstdc++.x86_64
 libstdc++-7-dev: libstdc++-devel.x86_64 libstdc++-static.x86_64
-libtirpc: libtirpc1
 libtirpc-dev: libtirpc-devel
 libtool-bin: libtool
 libtsan0: libtsan.x86_64
@@ -228,3 +227,6 @@ xsltproc: libxslt
 nasm: nasm.x86_64
 libpython2.7: python2-libs
 libc-dev: glibc-devel
+libsmbclient-dev: libsmbclient-devel
+samba-dev: samba-devel
+rpcsvc-proto: rpcgen
diff --git a/distro/adaptation/ubuntu-22.04 b/distro/adaptation/ubuntu-22.04
@@ -8,3 +8,4 @@ lib32gcc-dev: lib32gcc-12-dev
 libx32gcc-dev: libx32gcc-12-dev
 libipsec-mb0: libipsec-mb1
 libpython3.9: libpython3.10
+libtirpc: libtirpc-common
diff --git a/jobs/tbench.yaml b/jobs/tbench.yaml
@@ -3,6 +3,8 @@ testcase: tbench
 category: benchmark
 
 nr_threads: 100%
+runtime: 600
+iterations: 1
 
 cluster: cs-localhost
 

diff --git a/programs/dbench/parse b/programs/dbench/parse
@@ -1,13 +1,29 @@
-#!/usr/bin/awk -f
-# Throughput 51.9127 MB/sec  16 clients  16 procs  max_latency=969.602 ms
+#!/usr/bin/env ruby
 
+LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.realpath($PROGRAM_NAME)))
 
-BEGIN { FS="[ =]" }
+require "#{LKP_SRC}/lib/log"
+require "#{LKP_SRC}/lib/statistics"
 
-/Throughput.*MB\/.*/ {
-	printf("throughput-%s: %s \n", $3, $2)
-	printf("clients: %s \n", $5)
-	printf("procs: %s \n", 	$8)
-	printf("max_latency: %s \n", $12)
-}
+stats = Hash.new { |h, k| h[k] = [] }
 
+while (line = $stdin.gets)
+  case line
+  when /^Throughput*/
+    lines = line.split('=')
+    values = lines[0].split(' ')
+    stats['throughput_MB/s'] << values[1].to_f
+    stats['clients'] = values[3].to_i
+    stats['procs'] = values[5].to_i
+    stats['max_latency'] << lines[1].split(' ')[0].to_f
+  end
+end
+
+stats.each do |k, v|
+  if k != 'clients' && k != 'procs'
+    puts "#{k}: #{v.average.round(2)}"
+    puts "#{k}_harmonic_mean: #{v.harmonic_mean.round(2)}"
+  else
+    puts "#{k}: #{v}"
+  end
+end
diff --git a/programs/dbench/pkg/depends b/programs/dbench/pkg/depends
@@ -1,2 +1,4 @@
 libsmbclient
 libtirpc
+libtirpc-dev
+rpcsvc-proto
diff --git a/programs/tbench/run b/programs/tbench/run
@@ -1,14 +1,26 @@
 #!/bin/sh
 # - runtime
 # - nr_threads
+# - iterations
 
 ## TBENCH produces the network load to simulate the network part of
 ## the load of the commecial Netbench benchmark.  Unlike Netbench,
 ## it doesn't require a lab of Windows PCs:
+. $LKP_SRC/lib/reproduce-log.sh
+. $LKP_SRC/lib/env.sh
 
 [ -n "$direct_server_ips" ] && server=$direct_server_ips
 [ -z "$server" ] && server=127.0.0.1
 [ -n "$runtime" ] || runtime=600
-server=${server%% *}
+[ -n "$iterations" ] || iterations=1
+
+has_cmd tbench || die "tbench not found"
+[ -f /usr/local/share/client.txt ] || die "can not find load file"
 
-log_cmd tbench -t $runtime $nr_threads $server
+server=${server%% *}
+for i in $(seq $iterations)
+do
+  log_cmd tbench -t $runtime $nr_threads $server || die "tbench run failed, check run log"
+done
+log_echo killall -KILL tbench_srv
+killall -KILL tbench_srv
diff --git a/spec/stats/dbench/01 b/spec/stats/dbench/01
@@ -0,0 +1,40 @@
+2023-10-30 16:13:09 dbench 128 -c /usr/local/share/client.txt
+dbench version 4.00 - Copyright Andrew Tridgell 1999-2004
+
+Running for 600 seconds with load '/usr/local/share/client.txt' and minimum warmup 120 secs
+127 of 128 processes prepared for launch   0 sec
+128 of 128 processes prepared for launch   0 sec
+releasing clients
+ 128     18384  14924.44 MB/sec  warmup   1 sec  latency 45.920 ms
+ 128     39295  14716.65 MB/sec  warmup   2 sec  latency 9.680 ms
+ 128     58344  14133.44 MB/sec  warmup   3 sec  latency 12.586 ms
+ 128     79263  14208.11 MB/sec  warmup   4 sec  latency 10.701 ms
+ 128    100037  14258.50 MB/sec  warmup   5 sec  latency 12.715 ms
+ 128  14005624  13565.79 MB/sec  execute 595 sec  latency 10.820 ms
+ 128  14025477  13566.27 MB/sec  execute 596 sec  latency 14.378 ms
+ 128  14044062  13564.85 MB/sec  execute 597 sec  latency 10.197 ms
+ 128  14063777  13565.05 MB/sec  execute 598 sec  latency 11.805 ms
+ 128  14082566  13563.95 MB/sec  execute 599 sec  latency 11.331 ms
+ 128  cleanup 600 sec
+   0  cleanup 600 sec
+
+ Operation                Count    AvgLat    MaxLat
+ --------------------------------------------------
+ Deltree                   6400     4.399    23.896
+ Flush                  18168703     3.095    53.127
+ Close                  190417006     0.001     0.472
+ LockX                   844038     0.002     0.226
+ Mkdir                     3200     0.003     0.011
+ Rename                 10976955     0.032    12.386
+ ReadX                  406344034     0.004    12.776
+ WriteX                 129216677     0.028    12.800
+ Unlink                 52345694     0.081    12.660
+ UnlockX                 844038     0.001     0.301
+ FIND_FIRST             90839376     0.018    11.938
+ SET_FILE_INFORMATION   21117853     0.016    10.719
+ QUERY_FILE_INFORMATION 41171932     0.001     0.626
+ QUERY_PATH_INFORMATION 234963059     0.005    12.536
+ QUERY_FS_INFORMATION   43080704     0.008     0.832
+ NTCreateX              259219016     0.014    13.511
+
+Throughput 13563.9 MB/sec  128 clients  128 procs  max_latency=53.132 ms
diff --git a/spec/stats/dbench/01.yaml b/spec/stats/dbench/01.yaml
@@ -0,0 +1,6 @@
+throughput_MB/s: 13563.9
+throughput_MB/s_harmonic_mean: 13563.9
+clients: 128
+procs: 128
+max_latency: 53.13
+max_latency_harmonic_mean: 53.13
diff --git a/spec/stats/tbench/01 b/spec/stats/tbench/01
@@ -0,0 +1,133 @@
+2023-10-30 16:04:29 tbench_srv &
+waiting for connections
+2023-10-30 16:04:30 command -v tbench
+/usr/local/bin/tbench
+2023-10-30 16:04:30 tbench -t 30 128 127.0.0.1
+dbench version 4.00 - Copyright Andrew Tridgell 1999-2004
+
+Running for 30 seconds with load '/usr/local/share/client.txt' and minimum warmup 6 secs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^127 of 128 processes prepared for launch   0 sec
+^128 of 128 processes prepared for launch   0 sec
+releasing clients
+ 128     33330  24986.66 MB/sec  warmup   1 sec  latency 8.313 ms
+ 128     67069  24131.17 MB/sec  warmup   2 sec  latency 1.190 ms
+ 128    100652  23806.11 MB/sec  warmup   3 sec  latency 0.986 ms
+ 128    134140  23638.97 MB/sec  warmup   4 sec  latency 1.102 ms
+ 128    167942  23576.95 MB/sec  warmup   5 sec  latency 1.045 ms
+ 128    235712  23372.33 MB/sec  execute   1 sec  latency 1.040 ms
+ 128    269589  23392.06 MB/sec  execute   2 sec  latency 1.003 ms
+ 128    303470  23382.39 MB/sec  execute   3 sec  latency 3.351 ms
+ 128    337484  23403.76 MB/sec  execute   4 sec  latency 0.979 ms
+ 128    371136  23371.10 MB/sec  execute   5 sec  latency 8.580 ms
+ 128    404914  23384.49 MB/sec  execute   6 sec  latency 1.010 ms
+ 128    438770  23474.45 MB/sec  execute   7 sec  latency 0.980 ms
+ 128    472663  23556.48 MB/sec  execute   8 sec  latency 1.022 ms
+ 128    506737  23576.75 MB/sec  execute   9 sec  latency 1.102 ms
+ 128    540805  23583.56 MB/sec  execute  10 sec  latency 1.088 ms
+ 128    575016  23603.70 MB/sec  execute  11 sec  latency 0.982 ms
+ 128    609181  23605.15 MB/sec  execute  12 sec  latency 2.075 ms
+ 128    643693  23622.94 MB/sec  execute  13 sec  latency 0.997 ms
+ 128    678292  23640.83 MB/sec  execute  14 sec  latency 1.011 ms
+ 128    712981  23659.47 MB/sec  execute  15 sec  latency 8.071 ms
+ 128    747629  23675.41 MB/sec  execute  16 sec  latency 0.985 ms
+ 128    782213  23687.76 MB/sec  execute  17 sec  latency 0.983 ms
+ 128    816677  23699.37 MB/sec  execute  18 sec  latency 0.986 ms
+ 128    851060  23705.93 MB/sec  execute  19 sec  latency 1.020 ms
+ 128    885316  23726.41 MB/sec  execute  20 sec  latency 1.017 ms
+ 128    919643  23752.31 MB/sec  execute  21 sec  latency 0.981 ms
+ 128    954002  23767.51 MB/sec  execute  22 sec  latency 0.974 ms
+ 128    988345  23773.09 MB/sec  execute  23 sec  latency 1.015 ms
+ 128   1022838  23781.11 MB/sec  execute  24 sec  latency 0.995 ms
+ 128   1057367  23784.38 MB/sec  execute  25 sec  latency 8.632 ms
+ 128   1091655  23780.22 MB/sec  execute  26 sec  latency 0.979 ms
+ 128   1125943  23776.83 MB/sec  execute  27 sec  latency 1.001 ms
+ 128   1160350  23776.65 MB/sec  execute  28 sec  latency 0.981 ms
+ 128   1194639  23775.42 MB/sec  execute  29 sec  latency 1.014 ms
+ 128  cleanup  30 sec
+   0  cleanup  30 sec
+
+ Operation                Count    AvgLat    MaxLat
+ --------------------------------------------------
+ Deltree                    526     0.000     0.001
+ Flush                  1592951     0.025     0.653
+ Close                  16694517     0.025     2.073
+ LockX                    74029     0.025     0.972
+ Mkdir                      263     0.027     0.087
+ Rename                  962571     0.025     0.969
+ ReadX                  35675219     0.027     8.578
+ WriteX                 11323160     0.038     1.197
+ Unlink                 4589913     0.025     1.003
+ UnlockX                  74029     0.025     0.374
+ FIND_FIRST             7964718     0.025     3.347
+ SET_FILE_INFORMATION   1851624     0.025     0.975
+ QUERY_FILE_INFORMATION 3608859     0.025     1.004
+ QUERY_PATH_INFORMATION 20601434     0.025     2.209
+ QUERY_FS_INFORMATION   3777615     0.025     1.004
+ NTCreateX              22765090     0.025     8.629
+
+Throughput 23775.4 MB/sec  128 clients  128 procs  max_latency=8.632 ms
+2023-10-30 16:05:06 tbench -t 30 128 127.0.0.1
+dbench version 4.00 - Copyright Andrew Tridgell 1999-2004
+
+Running for 30 seconds with load '/usr/local/share/client.txt' and minimum warmup 6 secs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^127 of 128 processes prepared for launch   0 sec
+^128 of 128 processes prepared for launch   0 sec
+releasing clients
+ 128     28293  21694.12 MB/sec  warmup   1 sec  latency 1.086 ms
+ 128     57400  20860.35 MB/sec  warmup   2 sec  latency 0.976 ms
+ 128     86783  20675.11 MB/sec  warmup   3 sec  latency 1.435 ms
+ 128    116475  20627.71 MB/sec  warmup   4 sec  latency 8.066 ms
+ 128    146180  20606.07 MB/sec  warmup   5 sec  latency 1.017 ms
+ 128    205216  20438.16 MB/sec  execute   1 sec  latency 1.540 ms
+ 128    234834  20435.83 MB/sec  execute   2 sec  latency 1.017 ms
+ 128    264503  20450.59 MB/sec  execute   3 sec  latency 0.987 ms
+ 128    293993  20427.44 MB/sec  execute   4 sec  latency 1.076 ms
+ 128    323567  20421.67 MB/sec  execute   5 sec  latency 1.404 ms
+ 128    353155  20428.60 MB/sec  execute   6 sec  latency 0.981 ms
+ 128    382772  20434.01 MB/sec  execute   7 sec  latency 1.081 ms
+ 128    412625  20500.91 MB/sec  execute   8 sec  latency 8.158 ms
+ 128    442419  20563.30 MB/sec  execute   9 sec  latency 1.694 ms
+ 128    472294  20610.51 MB/sec  execute  10 sec  latency 1.434 ms
+ 128    502387  20647.16 MB/sec  execute  11 sec  latency 1.335 ms
+ 128    532530  20678.35 MB/sec  execute  12 sec  latency 1.061 ms
+ 128    562802  20703.25 MB/sec  execute  13 sec  latency 1.002 ms
+ 128    593008  20722.79 MB/sec  execute  14 sec  latency 0.979 ms
+ 128    623002  20725.59 MB/sec  execute  15 sec  latency 1.013 ms
+ 128    653214  20736.13 MB/sec  execute  16 sec  latency 0.983 ms
+ 128    683230  20733.49 MB/sec  execute  17 sec  latency 1.000 ms
+ 128    713422  20738.06 MB/sec  execute  18 sec  latency 8.087 ms
+ 128    743578  20745.25 MB/sec  execute  19 sec  latency 0.979 ms
+ 128    773347  20734.68 MB/sec  execute  20 sec  latency 0.979 ms
+ 128    803423  20741.74 MB/sec  execute  21 sec  latency 0.981 ms
+ 128    833441  20748.81 MB/sec  execute  22 sec  latency 1.252 ms
+ 128    863496  20760.30 MB/sec  execute  23 sec  latency 1.040 ms
+ 128    893742  20780.20 MB/sec  execute  24 sec  latency 1.080 ms
+ 128    924103  20794.43 MB/sec  execute  25 sec  latency 1.015 ms
+ 128    954397  20805.27 MB/sec  execute  26 sec  latency 3.252 ms
+ 128    984963  20821.45 MB/sec  execute  27 sec  latency 1.070 ms
+ 128   1015491  20839.81 MB/sec  execute  28 sec  latency 7.988 ms
+ 128   1045996  20852.99 MB/sec  execute  29 sec  latency 0.984 ms
+ 128  cleanup  30 sec
+   0  cleanup  30 sec
+
+ Operation                Count    AvgLat    MaxLat
+ --------------------------------------------------
+ Deltree                    498     0.000     0.001
+ Flush                  1397354     0.029     0.986
+ Close                  14647762     0.029     3.248
+ LockX                    64934     0.029     0.140
+ Mkdir                      249     0.033     0.113
+ Rename                  844352     0.030     1.007
+ ReadX                  31258470     0.031     8.051
+ WriteX                 9940455     0.043     8.156
+ Unlink                 4026634     0.029     2.453
+ UnlockX                  64934     0.029     0.147
+ FIND_FIRST             6987769     0.029     1.080
+ SET_FILE_INFORMATION   1624174     0.029     1.012
+ QUERY_FILE_INFORMATION 3167225     0.029     0.998
+ QUERY_PATH_INFORMATION 18074244     0.029     8.083
+ QUERY_FS_INFORMATION   3314000     0.029     0.981
+ NTCreateX              19940336     0.029     3.279
+
+Throughput 20853 MB/sec  128 clients  128 procs  max_latency=8.158 ms
+2023-10-30 16:05:42 killall -KILL tbench_srv
diff --git a/spec/stats/tbench/01.yaml b/spec/stats/tbench/01.yaml
@@ -0,0 +1,6 @@
+throughput_MB/s: 22314.2
+throughput_MB/s_harmonic_mean: 22218.52
+clients: 128
+procs: 128
+max_latency: 8.4
+max_latency_harmonic_mean: 8.39