Report 2005: Add data, review graphs

Change-Id: I2913ed579369a26a1226cfbe958432d1b3e11789
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 12c3608c3464add7664e3b8f41b07b9b8fd03f1c)

27 files changed, 368 insertions, 349 deletions

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 3ea7bdc2a8..a910632ccf 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -7,16 +7,6 @@
 
 .. include:: ../introduction/test_environment_intro.rst
 
-.. include:: ../introduction/test_environment_sut_calib_skx.rst
-
-.. include:: ../introduction/test_environment_sut_calib_clx.rst
-
-.. include:: ../introduction/test_environment_sut_calib_hsw.rst
-
-.. include:: ../introduction/test_environment_sut_calib_dnv.rst
-
-.. include:: ../introduction/test_environment_sut_calib_tsh.rst
-
 .. include:: ../introduction/test_environment_sut_conf_1.rst
 
 
@@ -58,3 +48,15 @@ Startup command template:
     l3fwd -v -l $$CORE_LIST -w $$INT1 -w $$INT2 --master-lcore 0 --in-memory -- --parse-ptype --eth-dest="0,${adj_mac0}" --eth-dest="1,${adj_mac1}" --config="${port_config}" [--enable-jumbo] -P -L -p 0x3
 
 .. include:: ../introduction/test_environment_tg.rst
+
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
+
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_clx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_dnv.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
diff --git a/docs/report/introduction/test_environment_intro.rst b/docs/report/introduction/test_environment_intro.rst
index da817f269d..7c4d5dfc9f 100644
--- a/docs/report/introduction/test_environment_intro.rst
+++ b/docs/report/introduction/test_environment_intro.rst
@@ -28,30 +28,3 @@ physical testbeds are maintained in FD.io CSIT repository:
 `FD.io CSIT testbeds - Xeon Cascade Lake`_,
 `FD.io CSIT testbeds - Xeon Skylake, Arm, Atom`_ and
 `FD.io CSIT Testbeds - Xeon Haswell`_.
-
-Pre-Test Server Calibration
----------------------------
-
-Number of SUT server sub-system runtime parameters have been identified
-as impacting data plane performance tests. Calibrating those parameters
-is part of FD.io CSIT pre-test activities, and includes measuring and
-reporting following:
-
-#. System level core jitter - measure duration of core interrupts by
-   Linux in clock cycles and how often interrupts happen. Using
-   `CPU core jitter tool <https://git.fd.io/pma_tools/tree/jitter>`_.
-
-#. Memory bandwidth - measure bandwidth with `Intel MLC tool
-   <https://software.intel.com/en-us/articles/intelr-memory-latency-checker>`_.
-
-#. Memory latency - measure memory latency with Intel MLC tool.
-
-#. Cache latency at all levels (L1, L2, and Last Level Cache) - measure
-   cache latency with Intel MLC tool.
-
-Measured values of listed parameters are especially important for
-repeatable zero packet loss throughput measurements across multiple
-system instances. Generally they come useful as a background data for
-comparing data plane performance results across disparate servers.
-
-Following sections include measured calibration data for testbeds.
diff --git a/docs/report/introduction/test_environment_pre_test_server_calib.rst b/docs/report/introduction/test_environment_pre_test_server_calib.rst
new file mode 100644
index 0000000000..325c61b212
--- /dev/null
+++ b/docs/report/introduction/test_environment_pre_test_server_calib.rst
@@ -0,0 +1,26 @@
+Pre-Test Server Calibration
+---------------------------
+
+Number of SUT server sub-system runtime parameters have been identified
+as impacting data plane performance tests. Calibrating those parameters
+is part of FD.io CSIT pre-test activities, and includes measuring and
+reporting following:
+
+#. System level core jitter - measure duration of core interrupts by
+   Linux in clock cycles and how often interrupts happen. Using
+   `CPU core jitter tool <https://git.fd.io/pma_tools/tree/jitter>`_.
+
+#. Memory bandwidth - measure bandwidth with `Intel MLC tool
+   <https://software.intel.com/en-us/articles/intelr-memory-latency-checker>`_.
+
+#. Memory latency - measure memory latency with Intel MLC tool.
+
+#. Cache latency at all levels (L1, L2, and Last Level Cache) - measure
+   cache latency with Intel MLC tool.
+
+Measured values of listed parameters are especially important for
+repeatable zero packet loss throughput measurements across multiple
+system instances. Generally they come useful as a background data for
+comparing data plane performance results across disparate servers.
+
+Following sections include measured calibration data for testbeds.
diff --git a/docs/report/introduction/test_environment_sut_calib_clx.rst b/docs/report/introduction/test_environment_sut_calib_clx.rst
index e12b0af693..ed44eb92d2 100644
--- a/docs/report/introduction/test_environment_sut_calib_clx.rst
+++ b/docs/report/introduction/test_environment_sut_calib_clx.rst
@@ -1,5 +1,5 @@
-Calibration Data - Cascade Lake
--------------------------------
+Cascade Lake
+~~~~~~~~~~~~
 
 Following sections include sample calibration data measured on
 s32-t27-sut1 server running in one of the Intel Xeon Skylake testbeds as
@@ -10,7 +10,7 @@ shows the same or similar values.
 
 
 Linux cmdline
-~~~~~~~~~~~~~
+^^^^^^^^^^^^^
 
 ::
 
@@ -18,7 +18,7 @@ Linux cmdline
     BOOT_IMAGE=/boot/vmlinuz-4.15.0-72-generic root=UUID=1d03969e-a2a0-41b2-a97e-1cc171b07e88 ro isolcpus=1-23,25-47,49-71,73-95 nohz_full=1-23,25-47,49-71,73-95 rcu_nocbs=1-23,25-47,49-71,73-95 numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off console=tty0 console=ttyS0,115200n8
 
 Linux uname
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ::
 
@@ -27,7 +27,7 @@ Linux uname
 
 
 System-level Core Jitter
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
@@ -82,7 +82,7 @@ System-level Core Jitter
 
 
 Memory Bandwidth
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 ::
 
@@ -139,7 +139,7 @@ Memory Bandwidth
 
 
 Memory Latency
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 ::
 
@@ -199,7 +199,7 @@ Memory Latency
 
 
 L1/L2/LLC Latency
-~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^
 
 ::
 
diff --git a/docs/report/introduction/test_environment_sut_calib_dnv.rst b/docs/report/introduction/test_environment_sut_calib_dnv.rst
index 3365552bb2..13f980656a 100644
--- a/docs/report/introduction/test_environment_sut_calib_dnv.rst
+++ b/docs/report/introduction/test_environment_sut_calib_dnv.rst
@@ -1,5 +1,5 @@
-Calibration Data - Denverton
-----------------------------
+Denverton
+~~~~~~~~~
 
 Following sections include sample calibration data measured on
 Denverton server at Intel SH labs.
@@ -9,7 +9,7 @@ adhering to FD.io CSIT best practices.
 
 
 Linux cmdline
-~~~~~~~~~~~~~
+^^^^^^^^^^^^^
 
 ::
 
@@ -18,7 +18,7 @@ Linux cmdline
 
 
 Linux uname
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ::
 
@@ -27,7 +27,7 @@ Linux uname
 
 
 System-level Core Jitter
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
@@ -72,7 +72,7 @@ System-level Core Jitter
 
 
 Memory Bandwidth
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 ::
 
@@ -128,7 +128,7 @@ Memory Bandwidth
 
 
 Memory Latency
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 ::
 
@@ -188,7 +188,7 @@ Memory Latency
 
 
 L1/L2/LLC Latency
-~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^
 
 ::
 
diff --git a/docs/report/introduction/test_environment_sut_calib_hsw.rst b/docs/report/introduction/test_environment_sut_calib_hsw.rst
index fe89d99028..d2e8d3d33d 100644
--- a/docs/report/introduction/test_environment_sut_calib_hsw.rst
+++ b/docs/report/introduction/test_environment_sut_calib_hsw.rst
@@ -1,5 +1,5 @@
-Calibration Data - Haswell
---------------------------
+Haswell
+~~~~~~~
 
 Following sections include sample calibration data measured on t1-sut1
 server running in one of the Intel Xeon Haswell testbeds as specified in
@@ -9,7 +9,7 @@ Calibration data obtained from all other servers in Haswell testbeds
 shows the same or similar values.
 
 Linux cmdline
-~~~~~~~~~~~~~
+^^^^^^^^^^^^^
 
 ::
 
@@ -18,7 +18,7 @@ Linux cmdline
 
 
 Linux uname
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ::
 
@@ -27,7 +27,7 @@ Linux uname
 
 
 System-level Core Jitter
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
@@ -81,7 +81,7 @@ System-level Core Jitter
 
 
 Memory Bandwidth
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 ::
 
@@ -138,7 +138,7 @@ Memory Bandwidth
 
 
 Memory Latency
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 ::
 
@@ -198,7 +198,7 @@ Memory Latency
 
 
 L1/L2/LLC Latency
-~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^
 
 ::
 
diff --git a/docs/report/introduction/test_environment_sut_calib_skx.rst b/docs/report/introduction/test_environment_sut_calib_skx.rst
index 16f7ae0762..e3038a230a 100644
--- a/docs/report/introduction/test_environment_sut_calib_skx.rst
+++ b/docs/report/introduction/test_environment_sut_calib_skx.rst
@@ -1,5 +1,5 @@
-Calibration Data - Skylake
---------------------------
+Skylake
+~~~~~~~
 
 Following sections include sample calibration data measured on
 s11-t31-sut1 server running in one of the Intel Xeon Skylake testbeds as
@@ -10,7 +10,7 @@ shows the same or similar values.
 
 
 Linux cmdline
-~~~~~~~~~~~~~
+^^^^^^^^^^^^^
 
 ::
 
@@ -19,7 +19,7 @@ Linux cmdline
 
 
 Linux uname
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ::
 
@@ -28,7 +28,7 @@ Linux uname
 
 
 System-level Core Jitter
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
@@ -72,7 +72,7 @@ System-level Core Jitter
 
 
 Memory Bandwidth
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 ::
 
@@ -129,7 +129,7 @@ Memory Bandwidth
 
 
 Memory Latency
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 ::
 
@@ -189,7 +189,7 @@ Memory Latency
 
 
 L1/L2/LLC Latency
-~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^
 
 ::
 
diff --git a/docs/report/introduction/test_environment_sut_calib_tsh.rst b/docs/report/introduction/test_environment_sut_calib_tsh.rst
index 00447b9fd9..a503a42404 100644
--- a/docs/report/introduction/test_environment_sut_calib_tsh.rst
+++ b/docs/report/introduction/test_environment_sut_calib_tsh.rst
@@ -1,5 +1,5 @@
-Calibration Data - TaiShan
---------------------------
+TaiShan
+~~~~~~~
 
 Following sections include sample calibration data measured on
 s17-t33-sut1 server running in one of the Cortex-A72 testbeds.
@@ -9,7 +9,7 @@ same or similar values.
 
 
 Linux cmdline
-~~~~~~~~~~~~~
+^^^^^^^^^^^^^
 
 ::
 
@@ -17,7 +17,7 @@ Linux cmdline
     BOOT_IMAGE=/boot/vmlinuz-4.15.0-54-generic root=/dev/mapper/huawei--1--vg-root ro isolcpus=1-15,17-31,33-47,49-63 nohz_full=1-15     17-31,33-47,49-63 rcu_nocbs=1-15     17-31,33-47,49-63 intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 console=ttyAMA0,115200n8
 
 Linux uname
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ::
 
@@ -26,7 +26,7 @@ Linux uname
 
 
 System-level Core Jitter
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif-3n-tsh-x520.rst
index f910c9cc48..056c80b523 100644
--- a/docs/report/vpp_performance_tests/packet_latency/container_memif-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/container_memif-3n-tsh-x520.rst
@@ -77,25 +77,26 @@
             \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc}
+        \end{figure}
 
 .. raw:: latex
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
index de8d25a6d0..c830be897c 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-3n-tsh-x520.rst
@@ -41,25 +41,26 @@
 78b-1t1c-ip6routing-base-scale-ixgbe
 ------------------------------------
 
-.. raw:: html
+..
+    .. raw:: html
 
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base}
+                \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-78b-1t1c-dot1q-ip6base}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst
index 4e02cda6e3..08152a0270 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst
@@ -190,14 +190,14 @@
             \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale1mmaclrn}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t1c-l2switching-features-avf
----------------------------------
+    64b-2t1c-l2switching-features-avf
+    ---------------------------------
 
-..
     .. raw:: html
 
         <center>
@@ -278,21 +278,21 @@
 
         \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows}
+                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows}
+        \end{figure}
 
 .. raw:: latex
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
index 57ddd9d3b7..22ba2ef758 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
@@ -20,5 +20,8 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-skx-xxv710
     container_memif-3n-skx-xxv710
     container_memif-2n-clx-xxv710
-    container_memif-2n-clx-cx556a
     container_memif-3n-tsh-x520
+
+..
+    container_memif-2n-clx-cx556a
+
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
index fdcdfc5c19..6f4047407d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
@@ -113,88 +113,89 @@
             \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t1c-features-ip4routing-base-avf
--------------------------------------
+    64b-2t1c-features-ip4routing-base-avf
+    -------------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t1c-features-ip4routing-base-dpdk
---------------------------------------
+    64b-2t1c-features-ip4routing-base-dpdk
+    --------------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
index b8c867856f..b7f546c3c8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -23,10 +23,10 @@ CSIT source code for the test cases used for plots can be found in
     ip4-3n-skx-x710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
-    ip4-2n-clx-cx556a
     ip4-3n-hsw-xl710
     ip4-3n-tsh-x520
 
 ..
+    ip4-2n-clx-cx556a
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
index 513b89b3df..7e34654125 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -23,10 +23,10 @@ CSIT source code for the test cases used for plots can be found in
     ip6-3n-skx-x710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
-    ip6-2n-clx-cx556a
     ip6-3n-hsw-xl710
     ip6-3n-tsh-x520
 
 ..
+    ip6-2n-clx-cx556a
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
index c333d2bccd..d59972f1b1 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
@@ -199,48 +199,49 @@
             \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t1c-features-l2switching-base-avf
---------------------------------------
+    64b-2t1c-features-l2switching-base-avf
+    --------------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr}
+                \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-avf-pdr}
+        \end{figure}
 
 ..
     64b-2t1c-features-l2switching-base-dpdk
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
index 3650748296..0bfd4ea5d7 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -23,10 +23,10 @@ CSIT source code for the test cases used for plots can be found in
     l2-3n-skx-x710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
-    l2-2n-clx-cx556a
     l2-3n-hsw-xl710
     l2-3n-tsh-x520
 
 ..
+    l2-2n-clx-cx556a
     l2-2n-dnv-x553
     l2-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
index 660529a341..dc8cfd708b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -24,6 +24,8 @@ CSIT source code for the test cases used for plots can be found in
     vm_vhost-3n-skx-xxv710
     vm_vhost-3n-skx-x710
     vm_vhost-2n-clx-xxv710
-    vm_vhost-2n-clx-cx556a
     vm_vhost-3n-hsw-xl710
     vm_vhost-3n-tsh-x520
+
+..
+    vm_vhost-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 5ef248903f..2d71148b57 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -7,16 +7,6 @@
 
 .. include:: ../introduction/test_environment_intro.rst
 
-.. include:: ../introduction/test_environment_sut_calib_skx.rst
-
-.. include:: ../introduction/test_environment_sut_calib_clx.rst
-
-.. include:: ../introduction/test_environment_sut_calib_hsw.rst
-
-.. include:: ../introduction/test_environment_sut_calib_dnv.rst
-
-.. include:: ../introduction/test_environment_sut_calib_tsh.rst
-
 .. include:: ../introduction/test_environment_sut_conf_1.rst
 
 
@@ -115,3 +105,15 @@ Description of VPP startup settings used in CSIT is provided in
 :ref:`test_methodology`.
 
 .. include:: ../introduction/test_environment_tg.rst
+
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
+
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_clx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_dnv.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
index 35ac97275c..a2acb2e241 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
@@ -22,5 +22,7 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-skx-xxv710
     container_memif-3n-skx-xxv710
     container_memif-2n-clx-xxv710
-    container_memif-2n-clx-cx556a
     container_memif-3n-tsh-x520
+
+..
+    container_memif-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
index f7a58ee560..b38010a488 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
@@ -113,88 +113,89 @@
             \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features-ip4routing-base-avf
---------------------------------
+    64b-features-ip4routing-base-avf
+    --------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features-ip4routing-base-dpdk
----------------------------------
+    64b-features-ip4routing-base-dpdk
+    ---------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
index 0153621769..7a388cb621 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -25,10 +25,10 @@ CSIT source code for the test cases used for plots can be found in
     ip4-3n-skx-x710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
-    ip4-2n-clx-cx556a
     ip4-3n-hsw-xl710
     ip4-3n-tsh-x520
 
 ..
+    ip4-2n-clx-cx556a
     ip4-2n-dnv-x553
     ip4-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
index 4eefb67fbc..667c4a4046 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -25,10 +25,10 @@ CSIT source code for the test cases used for plots can be found in
     ip6-3n-skx-x710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
-    ip6-2n-clx-cx556a
     ip6-3n-hsw-xl710
     ip6-3n-tsh-x520
 
 ..
+    ip6-2n-clx-cx556a
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
index d6f1407abc..e43b1adbc3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
@@ -70,45 +70,46 @@
             \label{fig:2n-clx-x710-64b-l2switching-base-scale-avf-pdr-tsa}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-l2switching-base-scale-dpdk
--------------------------------
+    64b-l2switching-base-scale-dpdk
+    -------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+                \label{fig:2n-clx-x710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+                \label{fig:2n-clx-x710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
index adf44d30a0..f4b8e9b472 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
@@ -199,45 +199,46 @@
             \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features-l2switching-base-avf
----------------------------------
+    64b-features-l2switching-base-avf
+    ---------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-l2switching-base-avf-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa}
+                \label{fig:3n-skx-xxv710-64b-features-l2switching-base-avf-pdr-tsa}
+        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 1068cd1c17..824ad81e9d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -25,10 +25,10 @@ CSIT source code for the test cases used for plots can be found in
     l2-3n-skx-x710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
-    l2-2n-clx-cx556a
     l2-3n-hsw-xl710
     l2-3n-tsh-x520
 
 ..
+    l2-2n-clx-cx556a
     l2-2n-dnv-x553
     l2-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index da85a8160f..b37cb7e345 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -23,6 +23,8 @@ CSIT source code for the test cases used for plots can be found in
     vm_vhost-3n-skx-xxv710
     vm_vhost-3n-skx-x710
     vm_vhost-2n-clx-xxv710
-    vm_vhost-2n-clx-cx556a
     vm_vhost-3n-hsw-xl710
     vm_vhost-3n-tsh-x520
+
+..
+    vm_vhost-2n-clx-cx556a