diff options
4 files changed, 55 insertions, 37 deletions
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index c2b0b2c30a..46fb042298 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -12,7 +12,7 @@ FD.io CSIT-1904 Report history and per .[ww] revision changes are listed below. | | - VPP 3n-skx NDRPDR full | | | - VPP 2n-skx NFV NDRPDR 64b and IMIX | | | | -| | 2. Added SOAK tests | +| | 2. Added Soak tests | | | | +----------------+------------------------------------------------------------+ | .19 | Initial version | diff --git a/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst b/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst index e84d902149..9c297f6501 100644 --- a/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst +++ b/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst @@ -1,7 +1,7 @@ -SOAK Tests vs. NDR Tests +Soak Tests vs. NDR Tests ------------------------ -Relative comparison of |vpp-release| SOAK PLRSearch vs. NDR packet throughput +Relative comparison of |vpp-release| Soak PLRSearch vs. NDR packet throughput is calculated for the tests executed on 2-Node Skylake physical testbed types, in 1-core configurations. @@ -14,5 +14,5 @@ in 1-core configurations. Comparison tables in ASCII and CSV formats: - - `ASCII SOAK vs. NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.txt>`_ - - `CSV SOAK vs. NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.csv>`_ + - `ASCII Soak vs. NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.txt>`_ + - `CSV Soak vs. NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.csv>`_ diff --git a/docs/report/vpp_performance_tests/soak_tests/index.rst b/docs/report/vpp_performance_tests/soak_tests/index.rst index 568d0477ee..4c6f226826 100644 --- a/docs/report/vpp_performance_tests/soak_tests/index.rst +++ b/docs/report/vpp_performance_tests/soak_tests/index.rst @@ -66,7 +66,7 @@ Additional information about graph data: .. raw:: html <center> - <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/example-soak-boxes.html"></iframe> + <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/soak-test-1.html"></iframe> <p><br></p> </center> @@ -75,6 +75,26 @@ Additional information about graph data: \begin{figure}[H] \centering \graphicspath{{../_build/_static/vpp/}} - \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{example-soak-boxes} - \label{fig:example-soak-boxes} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{soak-test-1} + \label{fig:soak-test-1} + \end{figure} + +.. raw:: latex + + \clearpage + +.. raw:: html + + <center> + <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/soak-test-2.html"></iframe> + <p><br></p> + </center> + +.. raw:: latex + + \begin{figure}[H] + \centering + \graphicspath{{../_build/_static/vpp/}} + \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{soak-test-2} + \label{fig:soak-test-2} \end{figure} diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index feb3fbb171..5719b2396a 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -1659,14 +1659,14 @@ # VPP SOAK vs NDR - type: "table" - title: "VPP SOAK vs NDR 2n-skx" + title: "VPP Soak vs NDR 2n-skx" algorithm: "table_soak_vs_ndr" output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx" reference: title: "NDR" data: "vpp-soak-vs-ndr-2n-skx-ref" compare: - title: "SOAK" + title: "Soak" data: "vpp-soak-vs-ndr-2n-skx-cmp" data: "vpp-soak-vs-ndr-2n-skx" include-tests: "NDR" @@ -4562,43 +4562,41 @@ title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" algorithm: "plot_soak_boxes" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-boxes" + output-file: "{DIR[STATIC,VPP]}/soak-test-1" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "DRV_AVF" + - "DRV_AVF" + - "DRV_AVF" + - "L2PATCH" + - "L2BDMACLRN" + - "L2XCBASE" layout: title: "30min Soak Test (PLRsearch)" layout: "plot-soak-throughput" -# Soak test - example, not used +# Soak test - 30min Soak Test (PLRsearch), boxes - type: "plot" - title: "VPP Throughput: 30min Soak Test (PLRsearch) bars" - algorithm: "plot_soak_bars" + title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" + algorithm: "plot_soak_boxes" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-bars" + output-file: "{DIR[STATIC,VPP]}/soak-test-2" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "VHOST" + - "MEMIF" + - "IP4FWD" + - "IP6FWD" layout: title: "30min Soak Test (PLRsearch)" layout: "plot-soak-throughput" |