Report: Add ICX

- Stats
- DPDK
  - comparisom tables
  - detailed results
  - graphs
    - tput
    - speedup
- VPP
  - detailed results
  - graphs
    - tput
    - speedup

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

83 files changed, 3174 insertions, 1691 deletions

diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
new file mode 100644
index 0000000000..84deaa2787
--- /dev/null
+++ b/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
@@ -0,0 +1,31 @@
+2n-Clx vs 2n-Icx Testbeds
+-------------------------
+
+Relative comparison of |dpdk-release| Testpmd and L3fwd packet
+throughput (NDR, PDR and MRR) is calculated for the same tests executed
+on 2-Node Cascadelake (2n-clx) and 2-Node Ice Lake (2n-icx) physical testbed
+types, in 1-core, 2-core and 4-core configurations.
+
+.. note::
+
+    Test results are stored in
+    `build logs from FD.io dpdk performance job 2n-clx`_ and
+    `build logs from FD.io dpdk performance job 2n-icx`_
+    with RF result files csit-dpdk-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+NDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII NDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-clx-2n-icx-ndr.txt>`_
+  - `CSV NDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-clx-2n-icx-ndr.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-clx-2n-icx-pdr.txt>`_
+  - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-clx-2n-icx-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
new file mode 100644
index 0000000000..bb01b2f3ff
--- /dev/null
+++ b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -0,0 +1,31 @@
+3n-Skx vs 3n-Icx Testbeds
+-------------------------
+
+Relative comparison of |dpdk-release| Testpmd and L3fwd packet
+throughput (NDR, PDR and MRR) is calculated for the same tests executed
+on 3-Node Skylake (3n-skx) and 3-Node Ice Lake (3n-icx) physical testbed
+types, in 1-core, 2-core and 4-core configurations.
+
+.. note::
+
+    Test results are stored in
+    `build logs from FD.io dpdk performance job 3n-skx`_ and
+    `build logs from FD.io dpdk performance job 3n-icx`_
+    with RF result files csit-dpdk-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+NDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII NDR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-3n-icx-ndr.txt>`_
+  - `CSV NDR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-3n-icx-ndr.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-3n-icx-pdr.txt>`_
+  - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-3n-icx-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/index.rst b/docs/report/dpdk_performance_tests/comparisons/index.rst
index 89a98e86b3..5f19dcadbe 100644
--- a/docs/report/dpdk_performance_tests/comparisons/index.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/index.rst
@@ -9,5 +9,7 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
+    2n-clx_vs_2n-icx_testbeds
+    3n-skx_vs_3n-icx_testbeds
     2n-skx_vs_2n-clx_testbeds
     3n-skx_vs_2n-skx_testbeds
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-e810cq.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-icx-xxv710.rst
index ea9caff65c..79aaca2fcd 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-e810cq.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-icx-xxv710.rst
@@ -28,16 +28,27 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-memif-base-avf
-------------------
+Following sections include summary graphs of Phy-to-Phy performance with
+packet routed forwarding, including NDR throughput (zero packet loss)
+and PDR throughput (<0.5% packet loss).
+
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/dpdk/perf?h=rls2110>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-base-avf-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-2t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -45,9 +56,9 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-memif-base-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-memif-base-avf-ndr-tsa}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-base-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-base-avf-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-2t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -65,22 +76,22 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-memif-base-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-memif-base-avf-pdr-tsa}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-base-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-memif-base-dpdk
--------------------
+64b-4t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-base-dpdk-ndr-tsa.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-4t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -88,9 +99,9 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-memif-base-dpdk-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-memif-base-dpdk-ndr-tsa}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-4t2c-base-ndr}
+            \label{fig:2n-icx-xxv710-64b-4t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +111,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-base-dpdk-pdr-tsa.html"></iframe>
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-4t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -108,7 +119,7 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-memif-base-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-memif-base-dpdk-pdr-tsa}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-4t2c-base-pdr}
+            \label{fig:2n-icx-xxv710-64b-4t2c-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-e810cq.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-icx-xxv710.rst
index dff46791c2..7db60d6007 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-e810cq.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-icx-xxv710.rst
@@ -28,16 +28,27 @@
 
     </script>
 
-2n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-avf
------------------------
+Following sections include summary graphs of Phy-to-Phy performance with
+packet routed forwarding, including NDR throughput (zero packet loss)
+and PDR throughput (<0.5% packet loss).
+
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/dpdk/perf?h=rls2110>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-base-avf-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-icx-xxv710-64b-2t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -45,9 +56,9 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-memif-base-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-avf-ndr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-base-ndr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-base-avf-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-icx-xxv710-64b-2t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -65,22 +76,22 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-memif-base-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-avf-pdr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-base-pdr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-memif-base-dpdk
-------------------------
+64b-4t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-base-dpdk-ndr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-icx-xxv710-64b-4t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -88,9 +99,9 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-memif-base-dpdk-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-dpdk-ndr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-4t2c-base-ndr}
+            \label{fig:3n-icx-xxv710-64b-4t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +111,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-base-dpdk-pdr.html"></iframe>
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-icx-xxv710-64b-4t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -108,7 +119,7 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-memif-base-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-dpdk-pdr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-4t2c-base-pdr}
+            \label{fig:3n-icx-xxv710-64b-4t2c-base-pdr}
     \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
index 5f07b50a64..e6e2d2c73d 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
@@ -45,6 +45,8 @@ Additional information about graph data:
 .. note::
 
     Test results are stored in
+    `build logs from FD.io dpdk performance job 2n-icx`_,
+    `build logs from FD.io dpdk performance job 3n-icx`_,
     `build logs from FD.io dpdk performance job 2n-skx`_,
     `build logs from FD.io dpdk performance job 3n-skx`_,
     `build logs from FD.io dpdk performance job 2n-clx`_,
@@ -60,6 +62,8 @@ Additional information about graph data:
 .. toctree::
     :maxdepth: 3
 
+    2n-icx-xxv710
+    3n-icx-xxv710
     2n-skx-xxv710
     2n-skx-x710
     3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-e810cq.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-icx-xxv710.rst
index 50e976d722..6574ed103b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-e810cq.rst
+++ b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-icx-xxv710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
-3n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-[avf,dpdk]
------------------------------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/dpdk/perf?h=rls2110>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-ip6routing-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -45,9 +52,9 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-2t1c-ip6routing-base-ndr}
-            \label{fig:3n-icx-e810cq-78b-2t1c-ip6routing-base-ndr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-base-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-ip6routing-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-icx-xxv710-64b-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -65,7 +72,7 @@
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-2t1c-ip6routing-base-pdr}
-            \label{fig:3n-icx-e810cq-78b-2t1c-ip6routing-base-pdr}
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-base-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-icx-xxv710.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-icx-xxv710.rst
new file mode 100644
index 0000000000..eae5585883
--- /dev/null
+++ b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-icx-xxv710.rst
@@ -0,0 +1,78 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+3n-icx-xxv710
+~~~~~~~~~~~~~
+
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/dpdk/perf?h=rls2110>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-base
+--------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-icx-xxv710-64b-base-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-base-ndr-tsa}
+            \label{fig:3n-icx-xxv710-64b-base-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/dpdk/3n-icx-xxv710-64b-base-pdr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-base-pdr-tsa}
+            \label{fig:3n-icx-xxv710-64b-base-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/index.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/index.rst
index 626d6759ac..c53f43d5f0 100644
--- a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/index.rst
+++ b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/index.rst
@@ -37,6 +37,8 @@ Additional information about graph data:
 .. note::
 
     Test results are stored in
+    `build logs from FD.io dpdk performance job 2n-icx`_,
+    `build logs from FD.io dpdk performance job 3n-icx`_,
     `build logs from FD.io dpdk performance job 2n-skx`_,
     `build logs from FD.io dpdk performance job 3n-skx`_,
     `build logs from FD.io dpdk performance job 2n-clx`_,
@@ -51,6 +53,8 @@ Additional information about graph data:
 .. toctree::
     :maxdepth: 3
 
+    2n-icx-xxv710
+    3n-icx-xxv710
     2n-skx-xxv710
     2n-skx-x710
     3n-skx-xxv710
diff --git a/docs/report/stats/durations.rst b/docs/report/stats/durations.rst
index b6414d077f..f084e7260b 100644
--- a/docs/report/stats/durations.rst
+++ b/docs/report/stats/durations.rst
@@ -1,6 +1,18 @@
 Job Durations
 =============
 
+2n-icx
+------
+
+  - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-2n-icx-iter.txt>`_
+  - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-2n-icx-cov.txt>`_
+
+3n-icx
+------
+
+  - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-3n-icx-iter.txt>`_
+  - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-3n-icx-cov.txt>`_
+
 2n-clx
 ------
 
diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
index a5dd15a84a..ec216ed6e6 100644
--- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -42,18 +42,17 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr-csv.csv>`_
   - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr-csv.csv>`_
 
-..
-  MRR Comparison
-  ~~~~~~~~~~~~~~
-
-  Comparison tables in HTML, ASCII and CSV formats:
-
-    - `HTML 1c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.html>`_
-    - `HTML 2c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.html>`_
-    - `HTML 4c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.html>`_
-    - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.txt>`_
-    - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.txt>`_
-    - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.txt>`_
-    - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr-csv.csv>`_
-    - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr-csv.csv>`_
-    - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr-csv.csv>`_
+MRR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.html>`_
+  - `HTML 2c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.html>`_
+  - `HTML 4c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.html>`_
+  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.txt>`_
+  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.txt>`_
+  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.txt>`_
+  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr-csv.csv>`_
+  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr-csv.csv>`_
+  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..5b3844d61a
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-xxv710.rst
@@ -0,0 +1,71 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-memif-base
+-------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-memif-base-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-icx-xxv710-64b-2t1c-memif-base-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-memif-base-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-icx-xxv710-64b-2t1c-memif-base-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-icx-xxv710-64b-2t1c-memif-base-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-memif-base-pdr}
+    \end{figure}
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 e4cee2aeaa..e3facf87b3 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,6 +20,6 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-skx-xxv710
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
-    container_memif-2n-icx-e810cq
+    container_memif-2n-icx-xxv710
     container_memif-2n-zn2-xxv710
     container_memif-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-xxv710.rst
index d9ee2b3152..7437c706e8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
-imix-2t1c-ipsec-ip4routing-scale-avf
-------------------------------------
+64b-2t1c-ip4routing-base-scale-avf
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@ imix-2t1c-ipsec-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@ imix-2t1c-ipsec-ip4routing-scale-avf
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@ imix-2t1c-ipsec-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-2t1c-ipsec-ip4routing-scale-avf
--------------------------------------
+64b-2t1c-ip4routing-base-scale-dpdk
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@ imix-2t1c-ipsec-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@ imix-2t1c-ipsec-ip4routing-scale-avf
 .. raw:: html
 
     <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +109,21 @@ imix-2t1c-ipsec-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-2t1c-ipsec-ip4routing-scale-dpdk
+64b-2t1c-ip4routing-base-scale-af_xdp
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr.html"></iframe>
+    <iframe id="11a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
 .. raw:: html
 
     <center>
-    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr.html"></iframe>
+    <iframe id="12a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,21 +152,21 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-2t1c-ipsec-ip4routing-scale-dpdk
---------------------------------------
+64b-2t1c-features-ip4routing-base-avf
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr.html"></iframe>
+    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
 .. raw:: html
 
     <center>
-    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr.html"></iframe>
+    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +195,6 @@ imix-2t1c-ipsec-ip4routing-scale-dpdk
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-xxv710.rst
index 88d007cf2a..d647680a21 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-[avf,dpdk]
------------------------------------
+64b-2t1c-ip4routing-base
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4routing-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-ip4routing-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4routing-base-ndr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4routing-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-ip4routing-base-ndr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-ip4routing-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4routing-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-ip4routing-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4routing-base-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4routing-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-ip4routing-base-pdr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-ip4routing-base-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 159583598a..9351495e66 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -24,8 +24,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
-    ip4-2n-icx-e810cq
-    ip4-3n-icx-e810cq
+    ip4-2n-icx-xxv710
+    ip4-3n-icx-xxv710
     ip4-2n-zn2-xxv710
     ip4-2n-zn2-x710
     ip4-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-xxv710.rst
index 67cce10b2f..246f21a9f9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-2t1c-ethip4--ethip4udpgeneve-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-xxv710.rst
index e98af3e52c..3db2ac29b0 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4tunnel-base-[avf,dpdk]
-----------------------------------
+64b-2t1c-ip4tunnel-base
+-----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-ip4tunnel-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-ip4tunnel-base-ndr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-ip4tunnel-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-ip4tunnel-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-ip4tunnel-base-pdr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-ip4tunnel-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
index 73ff3cf4cd..6f13fcb1a1 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
@@ -19,8 +19,8 @@ CSIT source code for the test cases used for plots can be found in
 
     ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
-    ip4_tunnels-2n-icx-e810cq
-    ip4_tunnels-3n-icx-e810cq
+    ip4_tunnels-2n-icx-xxv710
+    ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-2n-zn2-xxv710
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
deleted file mode 100644
index 92e168d1e5..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-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-icx-e810cq-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr}
-            \label{fig:2n-icx-e810cq-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-icx-e810cq-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
-            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-xxv710.rst
index 9e1406b8dd..bbe67363fc 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-avf
+78b-2t1c-ip6routing-base-scale-avf
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-dpdk
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +109,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-ip4routing-base-avf
+78b-2t1c-ip6routing-base-scale-af_xdp
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-ndr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-pdr.html"></iframe>
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,6 +152,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
+            \label{fig:2n-icx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-xxv710.rst
new file mode 100644
index 0000000000..c8206797d9
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-xxv710.rst
@@ -0,0 +1,71 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+3n-icx-xxv710
+~~~~~~~~~~~~~
+
+78b-2t1c-ip6routing-base
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-2t1c-ip6routing-base-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]{3n-icx-xxv710-78b-2t1c-ip6routing-base-ndr}
+            \label{fig:3n-icx-xxv710-78b-2t1c-ip6routing-base-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/3n-icx-xxv710-78b-2t1c-ip6routing-base-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]{3n-icx-xxv710-78b-2t1c-ip6routing-base-pdr}
+            \label{fig:3n-icx-xxv710-78b-2t1c-ip6routing-base-pdr}
+    \end{figure}
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 1f183f4451..fc0a710b95 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -24,8 +24,8 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
-    ip6-2n-icx-e810cq
-    ip6-3n-icx-e810cq
+    ip6-2n-icx-xxv710
+    ip6-3n-icx-xxv710
     ip6-2n-zn2-xxv710
     ip6-2n-zn2-x710
     ip6-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-xxv710.rst
new file mode 100644
index 0000000000..b36be5bc65
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-xxv710.rst
@@ -0,0 +1,458 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+3n-icx-xxv710
+~~~~~~~~~~~~~
+
+imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk
+---------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="9" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr}
+            \label{fig:3n-icx-xxv710-imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="3i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="4i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk
+----------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="5i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="6i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="7i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="8i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk
+--------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="9i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="10i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr}
+            \label{fig:3n-icx-xxv710-1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index f10e777e43..714f112e3c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -21,7 +21,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-skx-xxv710
-    ipsec-3n-icx-e810cq
+    ipsec-3n-icx-xxv710
     ipsec-3n-tsh-x520
     ipsec-2n-tx2-xl710
     ipsec-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-xxv710.rst
index 22829a3d67..435571e266 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-2t1c-l2switching-base-scale-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr.html"></iframe>
+    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr.html"></iframe>
+    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -80,7 +80,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-xxv710.rst
index 25f4b790a2..fcff1f5bf3 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-2t1c-l2switching-base
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-l2switching-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-l2switching-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-l2switching-base-ndr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-l2switching-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-l2switching-base-ndr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-l2switching-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-l2switching-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-2t1c-l2switching-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-l2switching-base-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-l2switching-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-2t1c-l2switching-base-pdr}
+            \label{fig:3n-icx-xxv710-64b-2t1c-l2switching-base-pdr}
     \end{figure}
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 492751adcb..8097f31046 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -24,8 +24,8 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-clx-xxv710
     l2-2n-clx-x710
     l2-2n-clx-cx556a
-    l2-2n-icx-e810cq
-    l2-3n-icx-e810cq
+    l2-2n-icx-xxv710
+    l2-3n-icx-xxv710
     l2-2n-zn2-xxv710
     l2-2n-zn2-x710
     l2-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
index 91c3e601ff..4fc1d8ae45 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44det-ip4routing-stl-bidir-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr.html"></iframe>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr.html"></iframe>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
index 2393c2c5d7..58e0e3d75b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
@@ -10,6 +10,4 @@ Det BiDir
 
     nat44-det-bidir-2n-clx
     nat44-det-bidir-2n-skx
-
-..
     nat44-det-bidir-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
index 9325f13fc3..482277f712 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-tcp-stf-cps-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
index 0f3b67e84e..91a210c063 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
@@ -10,6 +10,4 @@ ED TCP CPS
 
     nat44-ed-tcp-cps-2n-clx
     nat44-ed-tcp-cps-2n-skx
-
-..
     nat44-ed-tcp-cps-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
index b69db8985b..14a80fae1c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-tcp-tput-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
index 949752eff1..c3894be701 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
@@ -10,6 +10,4 @@ ED TCP TPUT
 
     nat44-ed-tcp-tput-2n-clx
     nat44-ed-tcp-tput-2n-skx
-
-..
     nat44-ed-tcp-tput-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
index de60c73aca..94ed2e7db7 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-udp-stf-cps-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
index 3d9ce592b7..659993a903 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
@@ -10,6 +10,4 @@ ED UDP CPS
 
     nat44-ed-udp-cps-2n-clx
     nat44-ed-udp-cps-2n-skx
-
-..
     nat44-ed-udp-cps-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
index 46e0be5839..ef8f25c834 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-udp-tput-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
index c29fa0a900..da0678646a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
@@ -10,6 +10,4 @@ ED UDP TPUT
 
     nat44-ed-udp-tput-2n-clx
     nat44-ed-udp-tput-2n-skx
-
-..
     nat44-ed-udp-tput-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
index 3750d19eb3..0c4d630f82 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-stl-unidir-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr.html"></iframe>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr.html"></iframe>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
index 50ac815624..f2d007db95 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
@@ -10,6 +10,4 @@ ED UniDir
 
     nat44-ed-unidir-2n-clx
     nat44-ed-unidir-2n-skx
-
-..
     nat44-ed-unidir-2n-icx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-xxv710.rst
index 200334c179..4acc5d7d99 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
 78b-2t1c-srv6-ip6routing-base-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-ndr}
-            \label{fig:3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr}
+            \label{fig:3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-pdr}
-            \label{fig:3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr}
+            \label{fig:3n-icx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
index 14cf66d600..ea74a1fd6d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -18,7 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-skx-xxv710
-    srv6-3n-icx-e810cq
+    srv6-3n-icx-xxv710
     srv6-3n-tsh-x520
 
 ..
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst
deleted file mode 100644
index 815df430b0..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-2t1c-vhost-base-testpmd
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-vhost-base-vpp
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-vpp-ndr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-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-icx-e810cq-64b-2t1c-vhost-base-vpp-pdr}
-            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-vpp-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..2909f0b35e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-xxv710.rst
@@ -0,0 +1,71 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-vhost-base
+-------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-vhost-base-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-icx-xxv710-64b-2t1c-vhost-base-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-vhost-base-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-icx-xxv710-64b-2t1c-vhost-base-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-icx-xxv710-64b-2t1c-vhost-base-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-vhost-base-pdr}
+    \end{figure}
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 0166b0acfa..bb160445b6 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
@@ -23,7 +23,7 @@ CSIT source code for the test cases used for plots can be found in
     vm_vhost-2n-skx-xxv710
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
-    vm_vhost-2n-icx-e810cq
+    vm_vhost-2n-icx-xxv710
     vm_vhost-2n-zn2-xxv710
     vm_vhost-2n-zn2-cx556a
     vm_vhost-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..705726c7ce
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-xxv710.rst
@@ -0,0 +1,71 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-memif-base
+--------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-memif-base-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-icx-xxv710-64b-memif-base-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-memif-base-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-icx-xxv710-64b-memif-base-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-icx-xxv710-64b-memif-base-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-memif-base-pdr-tsa}
+    \end{figure}
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 6400091672..f2fc7268d4 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,7 +22,7 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-skx-xxv710
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
-    container_memif-2n-icx-e810cq
+    container_memif-2n-icx-xxv710
     container_memif-2n-zn2-xxv710
     container_memif-2n-zn2-cx556a
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..086ffc9c13
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-xxv710.rst
@@ -0,0 +1,200 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-ip4routing-base-scale-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ip4routing-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-icx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-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-icx-xxv710-64b-ip4routing-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-icx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale-dpdk
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-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-icx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-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-icx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale-af_xdp
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-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-icx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-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-icx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \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-icx-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-icx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
+            \label{fig:2n-icx-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-icx-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-icx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-xxv710.rst
index 62100d830e..8032d5454e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-78b-ip6routing-base-[avf,dpdk]
-------------------------------
+64b-ip4routing-base
+-------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-ip6routing-base-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-ip4routing-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-ip6routing-base-ndr-tsa}
-            \label{fig:3n-icx-e810cq-78b-ip6routing-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-ip4routing-base-ndr-tsa}
+            \label{fig:3n-icx-xxv710-64b-ip4routing-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-ip6routing-base-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-ip4routing-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-ip6routing-base-pdr-tsa}
-            \label{fig:3n-icx-e810cq-78b-ip6routing-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-ip4routing-base-pdr-tsa}
+            \label{fig:3n-icx-xxv710-64b-ip4routing-base-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 878b8d9c4f..0c201b4173 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
@@ -26,8 +26,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
-    ip4-2n-icx-e810cq
-    ip4-3n-icx-e810cq
+    ip4-2n-icx-xxv710
+    ip4-3n-icx-xxv710
     ip4-2n-zn2-xxv710
     ip4-2n-zn2-x710
     ip4-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-xxv710.rst
index 67fe1d744e..dbcdd3651a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-2t1c-ethip4--ethip4udpgeneve-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-xxv710.rst
index 76fa235657..5bf61c233c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-ip4tunnel-base-[avf,dpdk]
------------------------------
+64b-ip4tunnel-base
+------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-ip4tunnel-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-ip4tunnel-base-ndr-tsa}
+            \label{fig:3n-icx-xxv710-64b-ip4tunnel-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-64b-ip4tunnel-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-64b-ip4tunnel-base-pdr-tsa}
+            \label{fig:3n-icx-xxv710-64b-ip4tunnel-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
index b7e8d774c8..c18583f9e0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
@@ -21,8 +21,8 @@ CSIT source code for the test cases used for plots can be found in
 
     ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
-    ip4_tunnels-2n-icx-e810cq
-    ip4_tunnels-3n-icx-e810cq
+    ip4_tunnels-2n-icx-xxv710
+    ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-2n-zn2-xxv710
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
deleted file mode 100644
index c53280bac6..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-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-icx-e810cq-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-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-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-icx-e810cq-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-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-base-scale-dpdk
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-ip6routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-ip6routing-base-scale-dpdk-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-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-xxv710.rst
index 42a53ace66..d0393e8ef1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-ip4routing-base-scale-avf
+78b-ip6routing-base-scale-avf
 -----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-base-scale-dpdk
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +109,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features-ip4routing-base-avf
+78b-ip6routing-base-scale-af_xdp
 --------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-features-ip4routing-base-avf-ndr-tsa.html"></iframe>
+    <iframe id="01a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-features-ip4routing-base-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-features-ip4routing-base-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-features-ip4routing-base-avf-pdr-tsa.html"></iframe>
+    <iframe id="02a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,6 +152,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-features-ip4routing-base-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-features-ip4routing-base-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
+            \label{fig:2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-xxv710.rst
index 5eb03f79b6..775d9241ac 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-xxv710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
-64b-ip4routing-base-[avf,dpdk]
-------------------------------
+78b-ip6routing-base
+-------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4routing-base-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-ip6routing-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4routing-base-ndr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4routing-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-ip6routing-base-ndr-tsa}
+            \label{fig:3n-icx-xxv710-78b-ip6routing-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4routing-base-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-ip6routing-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4routing-base-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4routing-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-ip6routing-base-pdr-tsa}
+            \label{fig:3n-icx-xxv710-78b-ip6routing-base-pdr-tsa}
     \end{figure}
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 d694d9fb04..6d2d9102d4 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
@@ -26,8 +26,8 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
-    ip6-2n-icx-e810cq
-    ip6-3n-icx-e810cq
+    ip6-2n-icx-xxv710
+    ip6-3n-icx-xxv710
     ip6-2n-zn2-xxv710
     ip6-2n-zn2-x710
     ip6-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
deleted file mode 100644
index 1c6e9d16dc..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
+++ /dev/null
@@ -1,201 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-icx-e810cq
-~~~~~~~~~~~~~
-
-imix-2t1c-ipsec-ip4routing-scale-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-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]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-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]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-ip4routing-scale-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-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]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-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]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    imix-2t1c-ipsec-ip4routing-scale-dpdk
-    -------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-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]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-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]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    1518b-2t1c-ipsec-ip4routing-scale-dpdk
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-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]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-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]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-xxv710.rst
new file mode 100644
index 0000000000..39a6223d37
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-xxv710.rst
@@ -0,0 +1,458 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+3n-icx-xxv710
+~~~~~~~~~~~~~
+
+1518b-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk
+----------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk
+--------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="9" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+            \label{fig:3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-aes128cbc-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-aes256gcm-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="3i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="4i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-ip4routing-base-scale-sw-dpdk
+---------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="5i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="6i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-avf
+------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="7i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="8i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-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]{3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-2t1c-ipsec-scheduler-ip4routing-base-scale-sw-dpdk
+-------------------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="9i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="10i" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-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]{3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+            \label{fig:3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index a46b7fede0..1805a00fc1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -22,7 +22,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-skx-xxv710
-    ipsec-3n-icx-e810cq
+    ipsec-3n-icx-xxv710
     ipsec-3n-tsh-x520
     ipsec-2n-tx2-xl710
     ipsec-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst
index 8fd92e7002..2a9bdc5780 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-l2switching-base-scale-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa.html"></iframe>
+    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -80,7 +80,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-xxv710.rst
index 7ecae4a581..40777ddb04 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-xxv710.rst
@@ -31,8 +31,8 @@
 3n-icx-e810cq
 ~~~~~~~~~~~~~
 
-64b-l2switching-base-[avf,dpdk]
--------------------------------
+64b-l2switching-base
+--------------------
 
 .. raw:: html
 
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 f1aad3520b..ed4a287e01 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
@@ -26,8 +26,8 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-clx-xxv710
     l2-2n-clx-x710
     l2-2n-clx-cx556a
-    l2-2n-icx-e810cq
-    l2-3n-icx-e810cq
+    l2-2n-icx-xxv710
+    l2-3n-icx-xxv710
     l2-2n-zn2-xxv710
     l2-2n-zn2-x710
     l2-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
index 728fbbee87..2e6f350a6e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44det-ip4routing-stl-bidir-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa.html"></iframe>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa.html"></iframe>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
index 2393c2c5d7..58e0e3d75b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
@@ -10,6 +10,4 @@ Det BiDir
 
     nat44-det-bidir-2n-clx
     nat44-det-bidir-2n-skx
-
-..
     nat44-det-bidir-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
index 0e83bd7940..ff6cbc7114 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-tcp-stf-cps-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
index 0f3b67e84e..91a210c063 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
@@ -10,6 +10,4 @@ ED TCP CPS
 
     nat44-ed-tcp-cps-2n-clx
     nat44-ed-tcp-cps-2n-skx
-
-..
     nat44-ed-tcp-cps-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
index ba878f8c50..97f9a58f1a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-tcp-tput-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -58,7 +58,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,6 +67,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
index 949752eff1..c3894be701 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
@@ -10,6 +10,4 @@ ED TCP TPUT
 
     nat44-ed-tcp-tput-2n-clx
     nat44-ed-tcp-tput-2n-skx
-
-..
     nat44-ed-tcp-tput-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
index d4a1e9629e..eeb57562fb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-udp-stf-cps-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
index 3d9ce592b7..659993a903 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
@@ -10,6 +10,4 @@ ED UDP CPS
 
     nat44-ed-udp-cps-2n-clx
     nat44-ed-udp-cps-2n-skx
-
-..
     nat44-ed-udp-cps-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
index 6dab3ef79e..c5f17ca109 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-udp-tput-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
index c29fa0a900..da0678646a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
@@ -10,6 +10,4 @@ ED UDP TPUT
 
     nat44-ed-udp-tput-2n-clx
     nat44-ed-udp-tput-2n-skx
-
-..
     nat44-ed-udp-tput-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
index bda8dd049a..7bb1d47e41 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-2n-icx-e810cq
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 64b-nat44ed-ip4routing-stl-unidir-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa.html"></iframe>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa.html"></iframe>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
index 50ac815624..f2d007db95 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
@@ -10,6 +10,4 @@ ED UniDir
 
     nat44-ed-unidir-2n-clx
     nat44-ed-unidir-2n-skx
-
-..
     nat44-ed-unidir-2n-icx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-xxv710.rst
index b4ce456047..97de27de0b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-xxv710.rst
@@ -28,7 +28,7 @@
 
     </script>
 
-3n-icx-e810cq
+3n-icx-xxv710
 ~~~~~~~~~~~~~
 
 78b-srv6-ip6routing-base-avf
@@ -37,7 +37,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-srv6-ip6routing-base-avf-ndr-tsa}
-            \label{fig:3n-icx-e810cq-78b-srv6-ip6routing-base-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-srv6-ip6routing-base-avf-ndr-tsa}
+            \label{fig:3n-icx-xxv710-78b-srv6-ip6routing-base-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-78b-srv6-ip6routing-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-78b-srv6-ip6routing-base-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-xxv710-78b-srv6-ip6routing-base-avf-pdr-tsa}
+            \label{fig:3n-icx-xxv710-78b-srv6-ip6routing-base-avf-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
index b7335eb282..999c153524 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
@@ -20,7 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-skx-xxv710
-    srv6-3n-icx-e810cq
+    srv6-3n-icx-xxv710
     srv6-3n-tsh-x520
 
 ..
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst
deleted file mode 100644
index d6240e64de..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-2n-icx-e810cq
-~~~~~~~~~~~~~
-
-64b-vhost-base-testpmd
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-vhost-base-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-vhost-base-vpp
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-vpp-ndr-tsa}
-            \label{fig:2n-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-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-icx-e810cq-64b-vhost-base-vpp-pdr-tsa}
-            \label{fig:2n-icx-e810cq-64b-vhost-base-vpp-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..4fd550c387
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-xxv710.rst
@@ -0,0 +1,71 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-vhost-base
+--------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-vhost-base-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-icx-xxv710-64b-vhost-base-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-vhost-base-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-icx-xxv710-64b-vhost-base-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-icx-xxv710-64b-vhost-base-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-vhost-base-pdr-tsa}
+    \end{figure}
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 eece4c4c60..a2a8c6794a 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
@@ -22,7 +22,7 @@ CSIT source code for the test cases used for plots can be found in
     vm_vhost-2n-skx-xxv710
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
-    vm_vhost-2n-icx-e810cq
+    vm_vhost-2n-icx-xxv710
     vm_vhost-2n-zn2-xxv710
     vm_vhost-2n-zn2-cx556a
     vm_vhost-3n-tsh-x520
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 977f237c22..0d024ec6a1 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -349,7 +349,7 @@
       - 10  # rls2110.rel NDRPDR iter env 9
       - 11  # rls2110.rel NDRPDR iter env 9
       - 12  # rls2110.rel NDRPDR iter env 9
-      # - 13  # rls2110.rel NDRPDR iter env 9
+      - 13  # rls2110.rel NDRPDR iter env 9
       - 14  # rls2110.rel NDRPDR iter env 9
       - 15  # rls2110.rel NDRPDR iter env 9
 
@@ -420,9 +420,9 @@
       - 16  # rls2202 NDRPDR iter env 9
       - 17  # rls2202 NDRPDR iter env 9
       - 18  # rls2202 NDRPDR iter env 9
-      # - 19  # rls2202 NDRPDR iter env 9
+      - 19  # rls2202 NDRPDR iter env 9
       - 20  # rls2202 NDRPDR iter env 9
-      # - 21  # rls2202 NDRPDR iter env 9
+      - 21  # rls2202 NDRPDR iter env 9
       - 22  # rls2202 NDRPDR iter env 9
 
   dpdk-2n-zn2-curr-iter-best:
@@ -611,7 +611,7 @@
       - 12  # rls2110.rel NDRPDR iter env 9
       - 13  # rls2110.rel NDRPDR iter env 9
       - 14  # rls2110.rel NDRPDR iter env 9
-      # - 15  # rls2110.rel NDRPDR iter env 9
+      - 15  # rls2110.rel NDRPDR iter env 9
       - 16  # rls2110.rel NDRPDR iter env 9
 
   vpp-3n-tsh-curr-iter:
@@ -678,9 +678,9 @@
       - 15  # rls2202 NDRPDR iter env 9
       - 16  # rls2202 NDRPDR iter env 9
       - 17  # rls2202 NDRPDR iter env 9
-      # - 18  # rls2202 NDRPDR iter env 9
+      - 18  # rls2202 NDRPDR iter env 9
       - 19  # rls2202 NDRPDR iter env 9
-      # - 20  # rls2202 NDRPDR iter env 9
+      - 20  # rls2202 NDRPDR iter env 9
 
   dpdk-3n-tsh-curr-iter-best:
     csit-dpdk-perf-report-iterative-2202-3n-tsh:
@@ -723,7 +723,7 @@
       - 13  # rls2110.rel NDRPDR iter env 9
       - 14  # rls2110.rel NDRPDR iter env 9
       - 15  # rls2110.rel NDRPDR iter env 9
-      # - 16  # rls2110.rel NDRPDR iter env 9
+      - 16  # rls2110.rel NDRPDR iter env 9
       - 17  # rls2110.rel NDRPDR iter env 9
       - 18  # rls2110.rel NDRPDR iter env 9
 
@@ -1043,31 +1043,71 @@
   # 2n-icx
 
   vpp-2n-icx-curr-iter:
-    intel-csit-vpp-perf-report-iterative-2110-2n-icx:
-      - 1   # rls2110.rel NDRPDR MRR iter env 8
-      - 3   # rls2110.rel NDRPDR iter env 8
+    intel-csit-vpp-perf-report-iterative-2202-2n-icx:
+      - 2   # rls2202.rel NDRPDR iter env 9
 
   vpp-2n-icx-curr-iter-best:
-    intel-csit-vpp-perf-report-iterative-2110-2n-icx:
-      - 3   # rls2110.rel NDRPDR iter env 8
+    intel-csit-vpp-perf-report-iterative-2202-2n-icx:
+      - 2   # rls2202.rel NDRPDR iter env 9
 
   vpp-2n-icx-curr-iter-mrr:
-    intel-csit-vpp-perf-report-iterative-2110-2n-icx:
-      - 2   # rls2110.rel MRR iter env 8
-
-  vpp-compare-testbeds-mrr-clx-icx-ref:
-    csit-vpp-perf-report-iterative-2202-2n-clx:
+    intel-csit-vpp-perf-report-iterative-2202-2n-icx:
       - 1   # rls2202.rc1 MRR iter env 9
-  vpp-compare-testbeds-mrr-clx-icx-cmp:
-    intel-csit-vpp-perf-report-iterative-2110-2n-icx:     # REPLACE
-      - 2   # rls2110.rel MRR iter env 8
+
+  vpp-2n-icx-curr-cov:
+    # csit-vpp-perf-report-coverage-2202-2n-icx:
+    csit-vpp-perf-report-iterative-2202-2n-icx:
+      - 2   # rls2202.rc1 NDRPDR iter env 9
+
+  dpdk-2n-icx-curr-iter:
+    csit-dpdk-perf-report-iterative-2202-2n-icx:
+      - 1   # rls2202 NDRPDR iter env 9
+      - 2   # rls2202 NDRPDR iter env 9
+      - 3   # rls2202 NDRPDR iter env 9
+      - 4   # rls2202 NDRPDR iter env 9
+      - 5   # rls2202 NDRPDR iter env 9
+      - 6   # rls2202 NDRPDR iter env 9
+      # - 7   # rls2202 NDRPDR iter env 9
+      - 8   # rls2202 NDRPDR iter env 9
+      - 9   # rls2202 NDRPDR iter env 9
+      - 10  # rls2202 NDRPDR iter env 9
+
+  dpdk-2n-icx-curr-iter-best:
+    csit-dpdk-perf-report-iterative-2202-2n-icx:
+      - 1   # rls2202 NDRPDR iter env 9
 
   # 3n-icx
 
   vpp-3n-icx-curr-iter:
-    intel-csit-vpp-perf-report-iterative-2110-3n-icx:
-      - 1   # rls2110.rel NDRPDR iter env 8
+    intel-csit-vpp-perf-report-iterative-2202-3n-icx:
+      - 4   # rls2202.rc1 NDRPDR iter env 9
 
   vpp-3n-icx-curr-iter-best:
-    intel-csit-vpp-perf-report-iterative-2110-3n-icx:
-      - 1   # rls2110.rel NDRPDR iter env 8
+    intel-csit-vpp-perf-report-iterative-2202-3n-icx:
+      - 4   # rls2202.rc1 NDRPDR iter env 9
+
+  vpp-3n-icx-curr-iter-mrr:
+    intel-csit-vpp-perf-report-iterative-2202-3n-icx:
+      - 3   # rls2202.rc1 MRR iter env 9
+
+  vpp-3n-icx-curr-cov:
+    # csit-vpp-perf-report-coverage-2202-3n-icx:
+    csit-vpp-perf-report-iterative-2202-3n-icx:
+      - 4   # rls2202.rc1 NDRPDR iter env 9
+
+  dpdk-3n-icx-curr-iter:
+    csit-dpdk-perf-report-iterative-2202-3n-icx:
+      - 2   # rls2202 NDRPDR iter env 9
+      - 3   # rls2202 NDRPDR iter env 9
+      - 4   # rls2202 NDRPDR iter env 9
+      - 5   # rls2202 NDRPDR iter env 9
+      - 6   # rls2202 NDRPDR iter env 9
+      - 7   # rls2202 NDRPDR iter env 9
+      - 8   # rls2202 NDRPDR iter env 9
+      - 9   # rls2202 NDRPDR iter env 9
+      - 10  # rls2202 NDRPDR iter env 9
+      - 11  # rls2202 NDRPDR iter env 9
+
+  dpdk-3n-icx-curr-iter-best:
+    csit-dpdk-perf-report-iterative-2202-3n-icx:
+      - 2   # rls2202 NDRPDR iter env 9
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9188da34ea..0c98c35132 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -5,6 +5,72 @@
 # Statistics: job-specs' durations
 
 - type: "table"
+  title: "Job Specification Duration: 2n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-icx-curr-iter"
+    # - job-spec: "vpp-gso-mrr-00"
+    #   data-set: "vpp-2n-icx-curr-iter-gso"
+    # - job-spec: "soak-00"
+    #   data-set: "vpp-2n-icx-curr-soak"
+    # - job-spec: "vsap-00"
+    #   data-set: "vpp-2n-icx-curr-iter-vsap"
+    # - job-spec: "nfv-density-mrr-00"
+    #   data-set: "vpp-2n-icx-curr-nfv-mrr"
+    # - job-spec: "nfv-density-mlr-00"
+    #   data-set: "vpp-2n-icx-curr-nfv-ndrpdr"
+    # - job-spec: "reconf-00"
+    #   data-set: "vpp-2n-icx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-icx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-icx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-icx-curr-cov"
+#   lines:
+
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-icx-curr-iter"
+    # - job-spec: "vpp-gso-mrr-00"
+    #   data-set: "vpp-3n-icx-curr-iter-gso"
+    # - job-spec: "soak-00"
+    #   data-set: "vpp-3n-icx-curr-soak"
+    # - job-spec: "vsap-00"
+    #   data-set: "vpp-3n-icx-curr-iter-vsap"
+    # - job-spec: "nfv-density-mrr-00"
+    #   data-set: "vpp-3n-icx-curr-nfv-mrr"
+    # - job-spec: "nfv-density-mlr-00"
+    #   data-set: "vpp-3n-icx-curr-nfv-ndrpdr"
+    # - job-spec: "reconf-00"
+    #   data-set: "vpp-3n-icx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-icx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-icx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-icx-curr-cov"
+#   lines:
+
+- type: "table"
   title: "Job Specification Duration: 2n-clx-iterative"
   algorithm: "table_job_spec_duration"
   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-iter"
@@ -2902,22 +2968,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
 - type: "table"
@@ -2925,22 +2989,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
 - type: "table"
@@ -2948,22 +3010,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
 - type: "table"
@@ -2971,22 +3031,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
 - type: "table"
@@ -2994,22 +3052,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
 - type: "table"
@@ -3017,22 +3073,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
 - type: "table"
@@ -3040,22 +3094,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
 - type: "table"
@@ -3063,22 +3115,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
@@ -4271,22 +4321,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
 - type: "table"
@@ -4294,22 +4342,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
 - type: "table"
@@ -4317,22 +4363,83 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
@@ -4415,7 +4522,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4433,7 +4540,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4621,7 +4728,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4639,7 +4746,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4786,7 +4893,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-icx
@@ -4794,7 +4901,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 3n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,ICX]}/"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
@@ -4930,22 +5037,22 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - VPP MRR Results 3n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#       data: "data msg"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
+# Detailed Test Results - VPP MRR Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-mrr-results-3n-icx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
@@ -5134,22 +5241,22 @@
   - "name"
   - "conf-history"
 
-# # Test configuration - VPP MRR Test Configs 3n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-#       data: "data conf-history"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
+# Test configuration - VPP MRR Test Configs 3n-icx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-mrr-results-3n-icx"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
@@ -6060,6 +6167,90 @@
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 - type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
@@ -6173,6 +6364,40 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}/dpdk_performance_results_2n_icx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}/dpdk_performance_results_3n_icx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ## Detailed Test Results - DPDK Performance Results 2n-dnv
 #- type: "table"
 #  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
@@ -6285,8 +6510,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6358,8 +6583,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6431,8 +6656,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6492,7 +6717,7 @@
     - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTR,MRR,VPP,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
     - "{DIR[DTR,MRR,VPP,2N,TX2]}"
@@ -6505,7 +6730,7 @@
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -6535,7 +6760,7 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -6565,7 +6790,7 @@
     - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTC,MRR,VPP,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
     - "{DIR[DTC,MRR,VPP,2N,TX2]}"
@@ -6578,7 +6803,7 @@
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -6608,7 +6833,7 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -6688,6 +6913,26 @@
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 2n-icx
+- type: "file"
+  title: "DPDK Performance Results 2n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-icx
+- type: "file"
+  title: "DPDK Performance Results 3n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
 ## DPDK Performance Results 2n-dnv
 #- type: "file"
 #  title: "DPDK Performance Results 2n-dnv"
@@ -11179,553 +11424,619 @@
 # 2n-icx
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Base-ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Base-ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-memif-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-memif-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-memif-base-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Base-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-vhost-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-vhost-base-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-vhost-base-vpp-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Base-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Throughput - DPDK
 
+# 2n-icx
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-2n-icx-curr-iter"
+  core: ["2t1c", "4t2c"]
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-icx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+# 3n-icx
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-3n-icx-curr-iter"
+  core: ["2t1c", "4t2c"]
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-icx-curr-iter"
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-clx
 
 - type: "plot"
@@ -12838,284 +13149,434 @@
 # 3n-icx Throughput
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-l2switching-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
 # 3n-icx Speedup
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4tunnel-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-78b-ip6routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-l2switching-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-l2switching-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
@@ -13193,7 +13654,7 @@
   output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
   target-links: "../../_static/vpp"
   data: "vpp-2n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -13204,7 +13665,7 @@
   output-file-links: "{DIR[LAT,VPP]}/3n_icx.rst"
   target-links: "../../_static/vpp"
   data: "vpp-3n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index 140a79c666..294e43ed99 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -36,6 +36,8 @@
 
     # Detailed test results
     DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results"
+    DIR[DTR,PERF,DPDK,2N,ICX]: "{DIR[DTR]}/dpdk_performance_results_2n_icx"
+    DIR[DTR,PERF,DPDK,3N,ICX]: "{DIR[DTR]}/dpdk_performance_results_3n_icx"
     DIR[DTR,PERF,DPDK,3N,SKX]: "{DIR[DTR]}/dpdk_performance_results_3n_skx"
     DIR[DTR,PERF,DPDK,2N,SKX]: "{DIR[DTR]}/dpdk_performance_results_2n_skx"
     DIR[DTR,PERF,DPDK,2N,ZN2]: "{DIR[DTR]}/dpdk_performance_results_2n_zn2"