test: Parameterize run time for throughput performance tests

Currently all the throughput tests are run for 30s.  This is reflected in
both the actual parameters given to the iperf commands, but also in the
matching sleeps in test_iperf3.

Allow this to be adjusted more easily with a new parameter to test_iperf3.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
[sbrivio: Reflect new parameter in comment to test_iperf3()]
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 23 insertions, 21 deletions

diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp
index 811b8de..a960341 100644
--- a/test/perf/passt_tcp
+++ b/test/perf/passt_tcp
@@ -44,7 +44,9 @@ hout	FREQ [ -n "__FREQ_CPUFREQ__" ] && echo __FREQ_CPUFREQ__ || echo __FREQ_PROC
 
 set	THREADS 1
 set	STREAMS 8
-set	OPTS -Z -P __STREAMS__ -l 1M -i1 -t30 -O5 --pacing-timer 1000000
+set	TIME 30
+hout	OMIT echo __TIME__ / 6 | bc -l
+set	OPTS -Z -P __STREAMS__ -l 1M -i1 -O__OMIT__ --pacing-timer 1000000
 
 info	Throughput in Gbps, latency in µs, one thread at __FREQ__ GHz, __STREAMS__ streams
 report	passt tcp __THREADS__ __FREQ__
@@ -58,19 +60,19 @@ bw	-
 
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 1280
-iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
 bw	__BW__ 1.2 1.5
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 1500
-iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
 bw	__BW__ 1.6 1.8
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 9000
-iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 8M
+iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 8M
 bw	__BW__ 4.0 5.0
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 65520
-iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __OPTS__ -w 16M
+iperf3	BW guest ns __GW6__%__IFNAME__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 16M
 bw	__BW__ 7.0 8.0
 
 tl	TCP RR latency over IPv6: guest to host
@@ -97,27 +99,27 @@ lat	__LAT__ 500 400
 tr	TCP throughput over IPv4: guest to host
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 256
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 1M
 bw	__BW__ 0.2 0.3
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 576
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 1M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 1M
 bw	__BW__ 0.5 0.8
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 1280
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
 bw	__BW__ 1.2 1.5
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 1500
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 4M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 4M
 bw	__BW__ 1.6 1.8
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 9000
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 8M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 8M
 bw	__BW__ 4.0 5.0
 virtio_net_workaround
 guest	ip link set dev __IFNAME__ mtu 65520
-iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __OPTS__ -w 16M
+iperf3	BW guest ns __GW__ 100${i}2 __THREADS__ __TIME__ __OPTS__ -w 16M
 bw	__BW__ 7.0 8.0
 
 tl	TCP RR latency over IPv4: guest to host
@@ -145,16 +147,16 @@ tr	TCP throughput over IPv6: host to guest
 bw	-
 bw	-
 ns	ip link set dev lo mtu 1280
-iperf3	BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 1.0 1.2
 ns	ip link set dev lo mtu 1500
-iperf3	BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 2.0 3.0
 ns	ip link set dev lo mtu 9000
-iperf3	BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 5.0 6.0
 ns	ip link set dev lo mtu 65520
-iperf3	BW ns guest ::1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest ::1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 6.0 6.8
 ns	ip link set dev lo mtu 65535
 
@@ -181,23 +183,23 @@ lat	__LAT__ 500 350
 
 tr	TCP throughput over IPv4: host to guest
 ns	ip link set dev lo mtu 256
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 0.3 0.5
 ns	ip link set dev lo mtu 576
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 0.5 1.0
 ns	ip link set dev lo mtu 1280
 ns	ip addr add ::1 dev lo
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 2.0 3.0
 ns	ip link set dev lo mtu 1500
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 2.0 3.0
 ns	ip link set dev lo mtu 9000
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 5.0 6.0
 ns	ip link set dev lo mtu 65520
-iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __OPTS__
+iperf3	BW ns guest 127.0.0.1 100${i}1 __THREADS__ __TIME__ __OPTS__
 bw	__BW__ 6.0 6.8
 ns	ip link set dev lo mtu 65535