From b7f1586493fa83fe91befc60817521bc4f505255 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 12 Oct 2020 11:26:51 +0200 Subject: Report: Add data, fix small bugs Change-Id: I39981b53640e45c95db20747b61d8af34eb4ce86 Signed-off-by: Tibor Frank (cherry picked from commit 8a5fee0d46f405a5e7838a99f25862f49b0c8192) --- .../vpp_performance_tests/packet_latency/index.rst | 6 +- .../packet_throughput_graphs/srv6.rst | 2 + .../nat44-2n-clx-xxv710.rst | 20 ++-- .../nat44-2n-skx-xxv710.rst | 20 ++-- .../throughput_speedup_multi_core/srv6.rst | 2 + resources/tools/presentation/generator_plots.py | 8 +- resources/tools/presentation/specification.yaml | 110 +++++++++++---------- 7 files changed, 90 insertions(+), 78 deletions(-) diff --git a/docs/report/vpp_performance_tests/packet_latency/index.rst b/docs/report/vpp_performance_tests/packet_latency/index.rst index e8b203d39e..8644ec785a 100644 --- a/docs/report/vpp_performance_tests/packet_latency/index.rst +++ b/docs/report/vpp_performance_tests/packet_latency/index.rst @@ -44,10 +44,12 @@ Additional information about graph data: l2 ip4 - ip6 - srv6 ip4_tunnels nat44 vm_vhost container_memif ipsec + +.. + ip6 + srv6 diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst index 14d3e7981a..3d25fa7e8f 100644 --- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst +++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst @@ -20,4 +20,6 @@ CSIT source code for the test cases used for plots can be found in srv6-3n-skx-xxv710 srv6-3n-hsw-xl710 srv6-3n-tsh-x520 + +.. srv6-3n-dnv-x553 diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst index fe17279d8a..7111856875 100644 --- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst +++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst @@ -80,7 +80,7 @@ .. raw:: html
- +


@@ -100,7 +100,7 @@ .. raw:: html
- +


@@ -124,7 +124,7 @@ .. raw:: html
- +


@@ -144,7 +144,7 @@ .. raw:: html
- +


@@ -167,7 +167,7 @@ .. raw:: html
- +


@@ -187,7 +187,7 @@ .. raw:: html
- +


@@ -210,7 +210,7 @@ .. raw:: html
- +


@@ -230,7 +230,7 @@ .. raw:: html
- +


@@ -253,7 +253,7 @@ .. raw:: html
- +


@@ -273,7 +273,7 @@ .. raw:: html
- +


diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst index ba168c951e..0debee7853 100644 --- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst +++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst @@ -80,7 +80,7 @@ .. raw:: html
- +


@@ -100,7 +100,7 @@ .. raw:: html
- +


@@ -124,7 +124,7 @@ .. raw:: html
- +


@@ -144,7 +144,7 @@ .. raw:: html
- +


@@ -167,7 +167,7 @@ .. raw:: html
- +


@@ -187,7 +187,7 @@ .. raw:: html
- +


@@ -210,7 +210,7 @@ .. raw:: html
- +


@@ -230,7 +230,7 @@ .. raw:: html
- +


@@ -253,7 +253,7 @@ .. raw:: html
- +


@@ -273,7 +273,7 @@ .. raw:: html
- +


diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst index 09e16f5213..568da0e85d 100644 --- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst +++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst @@ -22,4 +22,6 @@ CSIT source code for the test cases used for plots can be found in srv6-3n-skx-xxv710 srv6-3n-hsw-xl710 srv6-3n-tsh-x520 + +.. srv6-3n-dnv-x553 diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py index 1e21ee1562..b828b3c71d 100644 --- a/resources/tools/presentation/generator_plots.py +++ b/resources/tools/presentation/generator_plots.py @@ -721,7 +721,7 @@ def plot_tsa_name(plot, input_data): mode=u"lines", line=dict( dash=u"dot", - color=COLORS[-2], + color=COLORS[-1], width=1), hoverinfo=u"none" )) @@ -735,7 +735,7 @@ def plot_tsa_name(plot, input_data): text=f"Link: {lnk_limit:.2f}Mpps", font=dict( size=14, - color=COLORS[-2], + color=COLORS[-1], ), align=u"left", showarrow=False @@ -753,7 +753,7 @@ def plot_tsa_name(plot, input_data): mode=u"lines", line=dict( dash=u"dot", - color=COLORS[-3], + color=COLORS[-1], width=1), hoverinfo=u"none" )) @@ -767,7 +767,7 @@ def plot_tsa_name(plot, input_data): text=f"PCIe: {pci_limit:.2f}Mpps", font=dict( size=14, - color=COLORS[-3], + color=COLORS[-1], ), align=u"left", showarrow=False diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 0b082e2bc6..02e6964b75 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -131,7 +131,7 @@ x710: 35800000 xxv710: 35800000 xl710: 35800000 - cx556a: 60000000 + cx556a: 148809523.81 link: 10ge: 14880952.38 @@ -350,6 +350,7 @@ - 37 # rls2009 nf-density iter env 5 - 43 # rls2009 nf-density iter env 5 - 69 # rls2009 nf-density iter env 5 + - 70 # rls2009 nf-density iter env 5 - 72 # rls2009 nf-density iter env 5 - 75 # rls2009 nf-density iter env 5 @@ -579,9 +580,11 @@ - 2 # rls2009 NDRPDR cov 2n-clx-ip4-00 - 3 # rls2009 NDRPDR cov 2n-clx-ip4-01 - 4 # rls2009 NDRPDR cov 2n-clx-ip4-02 + - 5 # rls2009 NDRPDR cov 2n-clx-ip4-03 - 7 # rls2009 NDRPDR cov 2n-clx-ip4-05 - 9 # rls2009 NDRPDR cov 2n-clx-ip6-01 - 13 # rls2009 NDRPDR cov 2n-clx-memif-00 + - 14 # rls2009 NDRPDR cov 2n-clx-vhost-00 - 15 # rls2009 NDRPDR cov 2n-clx-vhost-01 - 16 # rls2009 NDRPDR cov 2n-clx-vts-00 @@ -1851,7 +1854,7 @@ xanchor: "left", yanchor: "top", x: 0, - y: -0.13, + y: -0.14, font: { family: "Consolas, Courier New", size: 13 @@ -2395,6 +2398,7 @@ - 37 # rls2009 nf-density iter env 5 - 43 # rls2009 nf-density iter env 5 - 69 # rls2009 nf-density iter env 5 + - 70 # rls2009 nf-density iter env 5 - 72 # rls2009 nf-density iter env 5 - 75 # rls2009 nf-density iter env 5 - 45 # rls2009 MRR nf-density iter env 5 @@ -2414,9 +2418,11 @@ - 2 # rls2009 NDRPDR cov 2n-clx-ip4-00 - 3 # rls2009 NDRPDR cov 2n-clx-ip4-01 - 4 # rls2009 NDRPDR cov 2n-clx-ip4-02 + - 5 # rls2009 NDRPDR cov 2n-clx-ip4-03 - 7 # rls2009 NDRPDR cov 2n-clx-ip4-05 - 9 # rls2009 NDRPDR cov 2n-clx-ip6-01 - 13 # rls2009 NDRPDR cov 2n-clx-memif-00 + - 14 # rls2009 NDRPDR cov 2n-clx-vhost-00 - 15 # rls2009 NDRPDR cov 2n-clx-vhost-01 - 16 # rls2009 NDRPDR cov 2n-clx-vts-00 @@ -13206,31 +13212,31 @@ title: "3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" layout: "plot-throughput" -- type: "plot" - title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" - algorithm: "plot_perf_box_name" - output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" - data: "plot-vpp-throughput-lat-tsa-3n-dnv" - include: - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" - layout: - title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" - layout: "plot-throughput" - -- type: "plot" - title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" - algorithm: "plot_perf_box_name" - output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" - data: "plot-vpp-throughput-lat-tsa-3n-dnv" - include: - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" - layout: - title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" - layout: "plot-throughput" +#- type: "plot" +# title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" +# algorithm: "plot_perf_box_name" +# output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" +# data: "plot-vpp-throughput-lat-tsa-3n-dnv" +# include: +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" +# layout: +# title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr" +# layout: "plot-throughput" +# +#- type: "plot" +# title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" +# algorithm: "plot_perf_box_name" +# output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" +# data: "plot-vpp-throughput-lat-tsa-3n-dnv" +# include: +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" +# layout: +# title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr" +# layout: "plot-throughput" - type: "plot" title: "Throughput: 2n-skx-xxv710-64b-2t1c-vhost-base-avf-ndr" @@ -16574,31 +16580,31 @@ title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa" layout: "plot-throughput-speedup-analysis" -- type: "plot" - title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" - algorithm: "plot_tsa_name" - output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" - data: "plot-vpp-throughput-lat-tsa-3n-dnv" - include: - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" - layout: - title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" - layout: "plot-throughput-speedup-analysis" - -- type: "plot" - title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" - algorithm: "plot_tsa_name" - output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" - data: "plot-vpp-throughput-lat-tsa-3n-dnv" - include: - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" - - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" - layout: - title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" - layout: "plot-throughput-speedup-analysis" +#- type: "plot" +# title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" +# algorithm: "plot_tsa_name" +# output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" +# data: "plot-vpp-throughput-lat-tsa-3n-dnv" +# include: +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" +# layout: +# title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa" +# layout: "plot-throughput-speedup-analysis" +# +#- type: "plot" +# title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" +# algorithm: "plot_tsa_name" +# output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" +# data: "plot-vpp-throughput-lat-tsa-3n-dnv" +# include: +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr" +# - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr" +# layout: +# title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa" +# layout: "plot-throughput-speedup-analysis" ################################################################################ -- cgit 1.2.3-korg