From e8ac8a3b7c48df53e7ba9e6485055d9c47d27b93 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 19 Oct 2021 09:25:29 +0200 Subject: test/perf: Use CPU frequency from /proc/cpuinfo instead of cpupower(1) Get it to work also in nested virtualisation environments. Signed-off-by: Stefano Brivio --- test/perf/passt_tcp | 4 ++-- test/perf/passt_udp | 4 ++-- test/perf/pasta_tcp | 4 ++-- test/perf/pasta_udp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/perf/passt_tcp b/test/perf/passt_tcp index 047072d..00d1c18 100644 --- a/test/perf/passt_tcp +++ b/test/perf/passt_tcp @@ -14,7 +14,7 @@ onlyfor passt_in_ns gtools sysctl ip jq nproc seq sleep bc iperf3 tcp_rr tcp_crr # From neper nstools sysctl ip jq nproc seq sleep bc iperf3 tcp_rr tcp_crr -htools cpupower sed seq +htools bc head sed seq test passt: throughput and latency @@ -33,7 +33,7 @@ ns sysctl -w net.ipv4.tcp_timestamps=0 gout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' -hout FREQ cpupower frequency-info -lm | sed -n 's/.*- \(.*\) GHz$/\1/p' +hout FREQ (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 set THREADS 1 diff --git a/test/perf/passt_udp b/test/perf/passt_udp index 528a75b..8c1b67f 100644 --- a/test/perf/passt_udp +++ b/test/perf/passt_udp @@ -14,7 +14,7 @@ onlyfor passt_in_ns gtools sysctl ip jq nproc sleep iperf3 udp_rr # From neper nstools ip jq sleep iperf3 udp_rr -htools cpupower sed +htools bc head sed test passt: throughput and latency @@ -26,7 +26,7 @@ guest /sbin/sysctl -w net.core.wmem_default=16777216 gout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' -hout FREQ cpupower frequency-info -lm | sed -n 's/.*- \(.*\) GHz$/\1/p' +hout FREQ (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 set THREADS 2 set STREAMS 1 diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp index a403eca..ac4cd60 100644 --- a/test/perf/pasta_tcp +++ b/test/perf/pasta_tcp @@ -12,7 +12,7 @@ # Author: Stefano Brivio onlyfor passt_in_ns -htools cpupower ip seq bc sleep iperf3 tcp_rr tcp_crr jq sed +htools head ip seq bc sleep iperf3 tcp_rr tcp_crr jq sed nstools sysctl nproc ip seq bc sleep iperf3 tcp_rr tcp_crr jq sed test pasta: throughput and latency (local connections) @@ -25,7 +25,7 @@ ns sysctl -w net.ipv4.tcp_timestamps=0 set THREADS 2 set STREAMS 2 set OPTS -Z -w 4M -l 1M -P __STREAMS__ -i1 -t30 -O5 --pacing-timer 10000 -hout FREQ cpupower frequency-info -lm | sed -n 's/.*- \(.*\) GHz$/\1/p' +hout FREQ (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 info Throughput in Gbps, latency in µs, __THREADS__ threads at __FREQ__ GHz, __STREAMS__ streams each diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp index 6dedbad..adaebd0 100644 --- a/test/perf/pasta_udp +++ b/test/perf/pasta_udp @@ -12,12 +12,12 @@ # Author: Stefano Brivio onlyfor passt_in_ns -htools cpupower ip sleep iperf3 udp_rr jq sed +htools bc head ip sleep iperf3 udp_rr jq sed nstools ip sleep iperf3 udp_rr jq sed test pasta: throughput and latency (local traffic) -hout FREQ cpupower frequency-info -lm | sed -n 's/.*- \(.*\) GHz$/\1/p' +hout FREQ (echo "scale=1"; sed -n 's/cpu MHz.*: \([0-9]*\)\..*$/(\1+10^2\/2)\/10^3/p' /proc/cpuinfo) | bc -l | head -n1 set THREADS 1 set STREAMS 4 -- cgit v1.2.3