From a920af7936e6b1ee29a954e40f8029a6cc411c95 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 26 Feb 2019 19:10:24 +0100 Subject: [PATCH] CSIT-1440: Re-organize graphs in report - fixes Change-Id: I4b960651570c9c1174637a8c043f5ced3ce79538 Signed-off-by: Tibor Frank --- .../vm_vhost-3n-hsw-x520.rst | 2 +- .../vm_vhost-3n-hsw-x710.rst | 4 +- .../vm_vhost-3n-skx-x710.rst | 117 +++++----- resources/tools/presentation/specification.yaml | 260 ++++++++++----------- 4 files changed, 192 insertions(+), 191 deletions(-) diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst index 8f9ef128f0..205386d6d0 100644 --- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst +++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst @@ -115,7 +115,7 @@ .. raw:: latex -\clearpage + \clearpage 64b-1t1c-base-vm-l2sw --------------------- diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst index fc4ddb9f5d..9965edf3e5 100644 --- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst +++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst @@ -166,7 +166,7 @@ .. raw:: html
- +


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


diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst index 62501043d7..258c880c1b 100644 --- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst +++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst @@ -34,88 +34,89 @@ 64b-base_and_features-l2sw -------------------------- -.. raw:: html +.. + .. raw:: html -
- -


-
+
+ +


+
-.. raw:: latex + .. raw:: latex - \begin{figure}[H] - \centering - \graphicspath{{../_build/_static/vpp/}} - \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa} - \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa} - \end{figure} + \begin{figure}[H] + \centering + \graphicspath{{../_build/_static/vpp/}} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa} + \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa} + \end{figure} -.. raw:: latex + .. raw:: latex - \clearpage + \clearpage -.. raw:: html + .. raw:: html -
- -


-
+
+ +


+
-.. raw:: latex + .. raw:: latex - \begin{figure}[H] - \centering - \graphicspath{{../_build/_static/vpp/}} - \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa} - \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa} - \end{figure} + \begin{figure}[H] + \centering + \graphicspath{{../_build/_static/vpp/}} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa} + \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa} + \end{figure} -.. raw:: latex + .. raw:: latex - \clearpage + \clearpage -64b-base_and_features-vm-l2sw ------------------------------ + 64b-base_and_features-vm-l2sw + ----------------------------- -.. raw:: html + .. raw:: html -
- -


-
+
+ +


+
-.. raw:: latex + .. raw:: latex - \begin{figure}[H] - \centering - \graphicspath{{../_build/_static/vpp/}} - \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa} - \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa} - \end{figure} + \begin{figure}[H] + \centering + \graphicspath{{../_build/_static/vpp/}} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa} + \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa} + \end{figure} -.. raw:: latex + .. raw:: latex - \clearpage + \clearpage -.. raw:: html + .. raw:: html -
- -


-
+
+ +


+
-.. raw:: latex + .. raw:: latex - \begin{figure}[H] - \centering - \graphicspath{{../_build/_static/vpp/}} - \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa} - \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa} - \end{figure} + \begin{figure}[H] + \centering + \graphicspath{{../_build/_static/vpp/}} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa} + \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa} + \end{figure} -.. raw:: latex + .. raw:: latex - \clearpage + \clearpage 64b-base_and_scale-ip4 ---------------------- diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 06fc2170eb..04b300bff7 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -14951,10 +14951,10 @@ - type: "plot" - title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr" + title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr" algorithm: "plot_performance_box" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr" + output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr" data: "plot-vpp-throughput-latency-3n-hsw" filter: "'NIC_Intel-X710' and '64B' and @@ -14983,7 +14983,7 @@ boxpoints: "outliers" whiskerwidth: 0 layout: - title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr" + title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr" layout: "plot-throughput" ## Packet Throughput - VPP vhost ip4 3n-hsw-xl710 @@ -28592,133 +28592,133 @@ # title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr" # layout: "plot-throughput-speedup-analysis" -# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base -- - type: "plot" - title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa" - algorithm: "plot_throughput_speedup_analysis" - output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa" - data: "plot-throughput-speedup-analysis-3n-skx" - filter: "'NIC_Intel-X710' and - '64B' and - 'NDRPDR' and - ('ETH' or 'DOT1Q') and - 'BASE' and - ('L2BDMACLRN' or 'L2XCFWD') and - 'VHOST_1024' and - not 'VXLAN' and - not 'IP4FWD' and - not '2VM' and - not 'LBOND'" - parameters: - - "throughput" - - "parent" - - "tags" - sort: - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2XCFWD" - - "L2XCFWD" - layout: - title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr" - layout: "plot-throughput-speedup-analysis" - -- - type: "plot" - title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa" - algorithm: "plot_throughput_speedup_analysis" - output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa" - data: "plot-throughput-speedup-analysis-3n-skx" - filter: "'NIC_Intel-X710' and - '64B' and - 'NDRPDR' and - ('ETH' or 'DOT1Q') and - 'BASE' and - ('L2BDMACLRN' or 'L2XCFWD') and - 'VHOST_1024' and - not 'VXLAN' and - not 'IP4FWD' and - not '2VM' and - not 'LBOND'" - parameters: - - "throughput" - - "parent" - - "tags" - sort: - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2XCFWD" - - "L2XCFWD" - layout: - title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr" - layout: "plot-throughput-speedup-analysis" - -# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm -- - type: "plot" - title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa" - algorithm: "plot_throughput_speedup_analysis" - output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa" - data: "plot-throughput-speedup-analysis-3n-skx" - filter: "'NIC_Intel-X710' and - '64B' and - 'NDRPDR' and - ('ETH' or 'DOT1Q') and - ('L2BDMACLRN' or 'L2XCFWD') and - 'VHOST_1024' and - not 'CFS_OPT' and - not 'VXLAN' and - not 'IP4FWD' and - not 'LBOND'" - parameters: - - "throughput" - - "parent" - - "tags" - sort: - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2XCFWD" - - "L2XCFWD" - - "L2XCFWD" - layout: - title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr" - layout: "plot-throughput-speedup-analysis" - -- - type: "plot" - title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa" - algorithm: "plot_throughput_speedup_analysis" - output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa" - data: "plot-throughput-speedup-analysis-3n-skx" - filter: "'NIC_Intel-X710' and - '64B' and - 'NDRPDR' and - ('ETH' or 'DOT1Q') and - ('L2BDMACLRN' or 'L2XCFWD') and - 'VHOST_1024' and - not 'CFS_OPT' and - not 'VXLAN' and - not 'IP4FWD' and - not 'LBOND'" - parameters: - - "throughput" - - "parent" - - "tags" - sort: - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2BDMACLRN" - - "L2XCFWD" - - "L2XCFWD" - - "L2XCFWD" - layout: - title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr" - layout: "plot-throughput-speedup-analysis" +## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base +#- +# type: "plot" +# title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa" +# algorithm: "plot_throughput_speedup_analysis" +# output-file-type: ".html" +# output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa" +# data: "plot-throughput-speedup-analysis-3n-skx" +# filter: "'NIC_Intel-X710' and +# '64B' and +# 'NDRPDR' and +# ('ETH' or 'DOT1Q') and +# 'BASE' and +# ('L2BDMACLRN' or 'L2XCFWD') and +# 'VHOST_1024' and +# not 'VXLAN' and +# not 'IP4FWD' and +# not '2VM' and +# not 'LBOND'" +# parameters: +# - "throughput" +# - "parent" +# - "tags" +# sort: +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2XCFWD" +# - "L2XCFWD" +# layout: +# title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr" +# layout: "plot-throughput-speedup-analysis" +# +#- +# type: "plot" +# title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa" +# algorithm: "plot_throughput_speedup_analysis" +# output-file-type: ".html" +# output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa" +# data: "plot-throughput-speedup-analysis-3n-skx" +# filter: "'NIC_Intel-X710' and +# '64B' and +# 'NDRPDR' and +# ('ETH' or 'DOT1Q') and +# 'BASE' and +# ('L2BDMACLRN' or 'L2XCFWD') and +# 'VHOST_1024' and +# not 'VXLAN' and +# not 'IP4FWD' and +# not '2VM' and +# not 'LBOND'" +# parameters: +# - "throughput" +# - "parent" +# - "tags" +# sort: +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2XCFWD" +# - "L2XCFWD" +# layout: +# title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr" +# layout: "plot-throughput-speedup-analysis" +# +## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm +#- +# type: "plot" +# title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa" +# algorithm: "plot_throughput_speedup_analysis" +# output-file-type: ".html" +# output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa" +# data: "plot-throughput-speedup-analysis-3n-skx" +# filter: "'NIC_Intel-X710' and +# '64B' and +# 'NDRPDR' and +# ('ETH' or 'DOT1Q') and +# ('L2BDMACLRN' or 'L2XCFWD') and +# 'VHOST_1024' and +# not 'CFS_OPT' and +# not 'VXLAN' and +# not 'IP4FWD' and +# not 'LBOND'" +# parameters: +# - "throughput" +# - "parent" +# - "tags" +# sort: +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2XCFWD" +# - "L2XCFWD" +# - "L2XCFWD" +# layout: +# title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr" +# layout: "plot-throughput-speedup-analysis" +# +#- +# type: "plot" +# title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa" +# algorithm: "plot_throughput_speedup_analysis" +# output-file-type: ".html" +# output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa" +# data: "plot-throughput-speedup-analysis-3n-skx" +# filter: "'NIC_Intel-X710' and +# '64B' and +# 'NDRPDR' and +# ('ETH' or 'DOT1Q') and +# ('L2BDMACLRN' or 'L2XCFWD') and +# 'VHOST_1024' and +# not 'CFS_OPT' and +# not 'VXLAN' and +# not 'IP4FWD' and +# not 'LBOND'" +# parameters: +# - "throughput" +# - "parent" +# - "tags" +# sort: +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2BDMACLRN" +# - "L2XCFWD" +# - "L2XCFWD" +# - "L2XCFWD" +# layout: +# title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr" +# layout: "plot-throughput-speedup-analysis" # Packet Speedup - VPP vhost ip4 2n-skx-x710 - -- 2.16.6