Report: Modify comparison tables, add data

Change-Id: I6d5e7cc0618a5b1889ab54c020fd98c661d20989
Signed-off-by: Tibor Frank <tifrank@cisco.com>

8 files changed, 291 insertions, 322 deletions

diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index 1ce9427d99..d2a0ffc528 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -14,4 +14,6 @@ Comparisons
     3n-skx_vs_3n-hsw_testbeds
     3n-skx_vs_2n-skx_testbeds
     nic_comparison
+
+..
     soak_vs_ndr
diff --git a/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst b/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
index 6db2756c38..2ba1c1204f 100644
--- a/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
+++ b/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
@@ -22,48 +22,12 @@ results repeatability vary between the test cases.
 
     Test results have been generated by
 
-    - `FD.io test executor vpp performance job 3n-hsw`_,
     - `FD.io test executor vpp performance job 3n-skx`_,
     - `FD.io test executor vpp performance job 2n-skx`_
 
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-3n-hsw
-~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 1t1c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.txt>`_
-  - `ASCII 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.txt>`_
-  - `CSV 1t1c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.csv>`_
-  - `CSV 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.txt>`_
-  - `ASCII 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.txt>`_
-  - `CSV 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.csv>`_
-  - `CSV 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.csv>`_
-
-MRR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.txt>`_
-  - `ASCII 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.txt>`_
-  - `ASCII 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.txt>`_
-  - `CSV 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.csv>`_
-  - `CSV 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.csv>`_
-  - `CSV 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.csv>`_
-
 3n-skx
 ~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/http_server_performance/index.rst b/docs/report/vpp_performance_tests/http_server_performance/index.rst
index b067042f17..fce8511b3a 100644
--- a/docs/report/vpp_performance_tests/http_server_performance/index.rst
+++ b/docs/report/vpp_performance_tests/http_server_performance/index.rst
@@ -64,11 +64,11 @@ Additional information about graph data:
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
     CSIT source code for the test cases used for plots can be found in
-    `CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/tcp?h=rls1901>`_.
+    `CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/tcp?h=rls1908>`_.
 
 .. raw:: latex
 
diff --git a/docs/report/vpp_performance_tests/index.rst b/docs/report/vpp_performance_tests/index.rst
index e33c37d31c..32d5390a93 100644
--- a/docs/report/vpp_performance_tests/index.rst
+++ b/docs/report/vpp_performance_tests/index.rst
@@ -8,12 +8,12 @@ VPP Performance
     packet_throughput_graphs/index
     throughput_speedup_multi_core/index
     packet_latency_graphs/index
-    soak_tests/index
     nf_service_density/index
+    http_server_performance/index
     comparisons/index
     throughput_trending
     test_environment
     documentation/index
 
 ..
-    http_server_performance/index
+    soak_tests/index
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
index 11f9350e8c..05a350e740 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
@@ -68,140 +68,141 @@ Additional information about graph data:
 
     \clearpage
 
-2n-skx-x710-mrr
-~~~~~~~~~~~~~~~
+..
+    2n-skx-x710-mrr
+    ~~~~~~~~~~~~~~~
 
-64b-2t1c-eth-l2bd
------------------
+    64b-2t1c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-4t2c-eth-l2bd
------------------
+    64b-4t2c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-8t4c-eth-l2bd
------------------
+    64b-8t4c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-2t1c-eth-l2bd
-------------------
+    imix-2t1c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-4t2c-eth-l2bd
-------------------
+    imix-4t2c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-8t4c-eth-l2bd
-------------------
+    imix-8t4c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 2n-skx-x710-ndr
 ~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
index 5dd31a9a31..e3bfbeeb27 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
@@ -68,140 +68,141 @@ Additional information about graph data:
 
     \clearpage
 
-2n-skx-x710-mrr
-~~~~~~~~~~~~~~~
+..
+    2n-skx-x710-mrr
+    ~~~~~~~~~~~~~~~
 
-64b-2t1c-eth-l2bd
------------------
+    64b-2t1c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-4t2c-eth-l2bd
------------------
+    64b-4t2c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-8t4c-eth-l2bd
------------------
+    64b-8t4c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-2t1c-eth-l2bd
-------------------
+    imix-2t1c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-4t2c-eth-l2bd
-------------------
+    imix-4t2c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-8t4c-eth-l2bd
-------------------
+    imix-8t4c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 2n-skx-x710-ndr
 ~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
index 90945d3572..42717c70ac 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
@@ -67,140 +67,141 @@ Additional information about graph data:
 
     \clearpage
 
-2n-skx-x710-mrr
-~~~~~~~~~~~~~~~
+..
+    2n-skx-x710-mrr
+    ~~~~~~~~~~~~~~~
 
-64b-2t1c-eth-l2bd
------------------
+    64b-2t1c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-4t2c-eth-l2bd
------------------
+    64b-4t2c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-8t4c-eth-l2bd
------------------
+    64b-8t4c-eth-l2bd
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-2t1c-eth-l2bd
-------------------
+    imix-2t1c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-4t2c-eth-l2bd
-------------------
+    imix-4t2c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-8t4c-eth-l2bd
-------------------
+    imix-8t4c-eth-l2bd
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr.html"></iframe>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr.html"></iframe>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr}
+                \label{fig:l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 2n-skx-x710-ndr
 ~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
index f2e0408cab..e97ea580ce 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
@@ -38,12 +38,12 @@
     10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 
     ### imix-?t?c-ipsec-ip4routing-base-scale-hw-i40e
     10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
@@ -53,8 +53,8 @@
 
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
-    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 
 3n-hsw-xl710
 ~~~~~~~~~~~~