Report: 2n-clx graphs

Change-Id: Iedd59e41bc946f054987650fb5dcf299289450be
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 7f983d313cacd8d3ade1b1c27ab2c29202017bbb)

20 files changed, 548 insertions, 322 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
index c1c2bef70c..e7613d7533 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
@@ -28,17 +28,52 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-memif-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+64b-2t1c-memif-base-avf
+-----------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-memif-base-dpdk
 ------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
index 2957866d6f..8a75b0cbea 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
@@ -28,21 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ###  64b-?t?c-ip4routing-base-scale-[avf,dpdk]
-    2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
-    2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
-    2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
index 349180ade0..122180f29c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
@@ -28,48 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-ip4routing-base-scale-avf
-    2n1l-10ge2p1xxv710-avf-dot1q-ip4base-ndrpdr - missing
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
-
-    ### 64b-?t?c-ip4routing-base-scale-dpdk
-    2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
-
-    ### 64b-?t?c-features-ip4routing-base-dpdk
-    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
-
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
-    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
@@ -245,6 +203,49 @@
 
     \clearpage
 
+64b-2t1c-features-ip4routing-base-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-features-ip4routing-base-dpdk
 --------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
index 3821c3ff75..7b2dae86de 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
@@ -28,26 +28,16 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ### 78b-?t?c-ip6routing-base-scale-dpdk
-    2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
-    2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
+78b-2t1c-ip6routing-base-scale-[avf,dpdk]
+-----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
-            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-ndr}
+            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-pdr}
+            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
index 5f9d8bb8f0..378dd96104 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
@@ -28,24 +28,53 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 78b-?t?c-ip6routing-base-scale-dpdk
-    2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr
-    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+
+78b-2t1c-ip6routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr.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]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
+            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr.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]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
+            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
index fb26e07622..dc7ee37a36 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
@@ -28,33 +28,59 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ### 64b-?t?c-l2switching-base-scale-[avf,dpdk]
-    2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
-
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-[avf,dpdk]
-----------------------------------------
+64b-2t1c-l2switching-base-scale-avf
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-ndr.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]{2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-ndr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-pdr.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]{2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-pdr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-scale-dpdk
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
-            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
-            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
index b699df1c62..57504de78a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
@@ -28,44 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-l2switching-base-avf
-    2n1l-10ge2p1xxv710-avf-eth-l2patch-ndrpdr
-    2n1l-10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr - missing
-
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
-
-    ### 64b-?t?c-l2switching-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
-
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
-
-    ### 64b-?t?c-l2switching-base-scale-dpdk
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
-
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
index 8a535ea660..93b32076de 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
@@ -28,27 +28,95 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-vhost-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
-
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
-
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+64b-2t1c-vhost-base-avf-testpmd
+-------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-vhost-base-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-vhost-base-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-vhost-base-avf-vpp
+---------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr.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]{2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr.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]{2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-vhost-base-dpdk-testpmd
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
index 26bf6d7962..790287d940 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
@@ -28,17 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-vts-l2switching-base-dpdk
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
-
-    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
index f13c97b049..cfffc24772 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
@@ -19,6 +19,4 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vts-2n-skx-xxv710
-
-..
     vts-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
index 709f6ef68b..12356c34e3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
@@ -28,17 +28,52 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-memif-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+64b-memif-base-avf
+------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-avf-ndr-tsa.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]{2n-clx-xxv710-64b-memif-base-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-memif-base-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-avf-pdr-tsa.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]{2n-clx-xxv710-64b-memif-base-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-memif-base-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-memif-base-dpdk
 -------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
index 74c08b57db..5462a0a953 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
@@ -28,15 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ###  64b-ip4routing-base-scale-[avf,dpdk]
-    2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
-    2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
-    2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
index 762a4af00c..69a09151e3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
@@ -28,30 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-ip4routing-base-scale-avf
-    2n1l-10ge2p1xxv710-avf-dot1q-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
-
-    ### 64b-ip4routing-base-scale-dpdk
-    2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
-
-    ### 64b-features-ip4routing-base-dpdk
-    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
@@ -227,6 +203,49 @@
 
     \clearpage
 
+64b-features-ip4routing-base-avf
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa.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]{2n-clx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa.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]{2n-clx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-features-ip4routing-base-dpdk
 ---------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
index b5cae9adf7..7f272c61eb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
@@ -28,22 +28,16 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ### 78b-ip6routing-base-scale-dpdk
-    2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
-    2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-dpdk
-------------------------------
+78b-ip6routing-base-scale-[avf,dpdk]
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,7 +46,7 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-ndr-tsa}
             \label{fig:2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
@@ -63,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
index aca728fc0a..99d611d2f0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
@@ -28,18 +28,52 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 78b-ip6routing-base-scale-dpdk
-    2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
-    2n1l-10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+78b-ip6routing-base-scale-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa.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]{2n-clx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa.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]{2n-clx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
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 ea9278e495..d6f1407abc 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
@@ -28,26 +28,59 @@
 
     </script>
 
-..
-    ## 2n-clx-x710
-    ### 64b-l2switching-base-scale-[avf,dpdk]
-    2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
-
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-[avf,dpdk]
------------------------------------
+64b-l2switching-base-scale-avf
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-avf-ndr-tsa.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]{2n-clx-x710-64b-l2switching-base-scale-avf-ndr-tsa}
+            \label{fig:2n-clx-x710-64b-l2switching-base-scale-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-avf-pdr-tsa.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]{2n-clx-x710-64b-l2switching-base-scale-avf-pdr-tsa}
+            \label{fig:2n-clx-x710-64b-l2switching-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-l2switching-base-scale-dpdk
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
+    <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>
 
@@ -56,8 +89,8 @@
     \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-[avf,dpdk]-ndr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
+            \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
@@ -67,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
+    <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>
 
@@ -76,6 +109,6 @@
     \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-[avf,dpdk]-pdr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
+            \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-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
index 37934c2aa4..a19b00592c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
@@ -28,28 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-l2switching-base-avf
-    2n1l-10ge2p1xxv710-avf-eth-l2patch-ndrpdr
-    2n1l-10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
-
-    ### 64b-l2switching-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
-
-    ### 64b-l2switching-base-scale-dpdk
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
index 27b5c0e543..ae4664e943 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
@@ -28,27 +28,95 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-?t?c-vhost-base-dpdk
-    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
-
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
-
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
-    Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
+64b-vhost-base-avf-testpmd
+--------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-avf-ndr-tsa.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]{2n-clx-xxv710-64b-vhost-base-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-avf-pdr-tsa.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]{2n-clx-xxv710-64b-vhost-base-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-vhost-base-avf-vpp
+----------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-avf-vpp-ndr-tsa.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]{2n-clx-xxv710-64b-vhost-base-avf-vpp-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-avf-vpp-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-avf-vpp-pdr-tsa.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]{2n-clx-xxv710-64b-vhost-base-avf-vpp-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-avf-vpp-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
 64b-vhost-base-dpdk-testpmd
 ---------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
index cb47eca3cb..f365523bff 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
@@ -28,13 +28,6 @@
 
     </script>
 
-..
-    ## 2n-clx-xxv710
-    ### 64b-vts-l2switching-base-dpdk
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
-    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
index a10fb79992..0fc3ece312 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
@@ -20,6 +20,4 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vts-2n-skx-xxv710
-
-..
     vts-2n-clx-xxv710