Report: Remove skx testbeds

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

173 files changed, 246 insertions, 16031 deletions

diff --git a/docs/report/detailed_test_results/dpdk_performance_results/index.rst b/docs/report/detailed_test_results/dpdk_performance_results/index.rst
index bd20d823aa..102aeec168 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results/index.rst
@@ -4,8 +4,6 @@ DPDK Throughput
 .. toctree::
     ../dpdk_performance_results_2n_icx/index
     ../dpdk_performance_results_3n_icx/index
-    ../dpdk_performance_results_2n_skx/index
-    ../dpdk_performance_results_3n_skx/index
     ../dpdk_performance_results_2n_clx/index
     ../dpdk_performance_results_2n_zn2/index
     ../dpdk_performance_results_3n_alt/index
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
deleted file mode 100644
index 9a00d28f7a..0000000000
--- a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io dpdk coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
deleted file mode 100644
index 87021f3348..0000000000
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io dpdk coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/detailed_test_results/vpp_mrr_results/index.rst b/docs/report/detailed_test_results/vpp_mrr_results/index.rst
index d25bd8cb9f..7aac9e47b1 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results/index.rst
@@ -6,8 +6,6 @@ VPP MRR
     Data sources for reported test results:
     i) `build logs from FD.io vpp iterative job 2n-icx`_,
     `build logs from FD.io vpp iterative job 3n-icx`_,
-    `build logs from FD.io vpp iterative job 2n-skx`_,
-    `build logs from FD.io vpp iterative job 3n-skx`_,
     `build logs from FD.io vpp iterative job 2n-clx`_,
     `build logs from FD.io vpp iterative job 2n-zn2`_,
     `build logs from FD.io vpp iterative job 3n-alt`_,
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
deleted file mode 100644
index 1118cdc61c..0000000000
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io vpp coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
deleted file mode 100644
index 90bdb3cb53..0000000000
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io vpp coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/detailed_test_results/vpp_performance_results/index.rst b/docs/report/detailed_test_results/vpp_performance_results/index.rst
index 63d51497c2..12cc29f82f 100644
--- a/docs/report/detailed_test_results/vpp_performance_results/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results/index.rst
@@ -6,8 +6,6 @@ VPP Throughput
     Data sources for reported test results:
     i) `build logs from FD.io vpp coverage job 2n-icx`_,
     `build logs from FD.io vpp coverage job 3n-icx`_,
-    `build logs from FD.io vpp coverage job 2n-skx`_,
-    `build logs from FD.io vpp coverage job 3n-skx`_,
     `build logs from FD.io vpp coverage job 2n-clx`_,
     `build logs from FD.io vpp coverage job 2n-zn2`_,
     `build logs from FD.io vpp coverage job 3n-alt`_,
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
deleted file mode 100644
index 1118cdc61c..0000000000
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io vpp coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
deleted file mode 100644
index 90bdb3cb53..0000000000
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io vpp coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
deleted file mode 100644
index ec123450a4..0000000000
--- a/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-2n-Icx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR) is calculated for the same tests executed
-on 2-Node Cascadelake (2n-skx) 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-skx`_ 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-skx-2n-icx-ndr.txt>`_
-  - `CSV NDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-ndr.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-pdr.txt>`_
-  - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
deleted file mode 100644
index 6a3d22b8a0..0000000000
--- a/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-2n-Clx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR) is calculated for the same tests executed
-on 2-Node Skylake (2n-skx) and 2-Node Cascade Lake (2n-clx) 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-skx`_ and
-    `build logs from FD.io dpdk performance job 2n-clx`_
-    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-skx-2n-clx-ndr.txt>`_
-  - `CSV NDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-ndr.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-pdr.txt>`_
-  - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
deleted file mode 100644
index 19550be79f..0000000000
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-
-.. _dpdk_compare_topologies_3n-Skx_vs_2n-Skx:
-
-3n-Skx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR) is calculated for the same tests executed
-on 3-Node Skylake (3n-skx) and 2-Node Skylake (2n-skx) 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 2n-skx`_
-    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-topologies-3n-skx-2n-skx-ndr.txt>`_
-  - `CSV NDR comparison <../../_static/dpdk/performance-compare-topologies-3n-skx-2n-skx-ndr.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-topologies-3n-skx-2n-skx-pdr.txt>`_
-  - `CSV PDR comparison <../../_static/dpdk/performance-compare-topologies-3n-skx-2n-skx-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
deleted file mode 100644
index 6560afb860..0000000000
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-3n-Icx vs 3n-Skx Testbeds
--------------------------
-
-Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR) 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/current_vs_previous_release.rst b/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
index 42bb2351d3..8b3a4427fb 100644
--- a/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
@@ -7,8 +7,8 @@ Current vs Previous Release
 Relative comparison of DPDK Testpmd and L3fwd packet throughput (NDR,
 PDR and MRR) between |dpdk-release| and |dpdk-release-1| (measured for
 |csit-release| and |csit-release-1| respectively) is calculated from
-results of tests running on 3n-skx, 2n-skx, 2n-clx, 2n-zn2 testbeds
-in 1-core and 2-core configurations.
+results of tests running on 3n-icx, 2n-ics, 2n-clx, 2n-zn2, 3n-tsh, 2n-tx2
+testbeds in 1-core and 2-core configurations.
 
 Listed mean and standard deviation values are computed based on a series
 of the same tests executed against respective DPDK releases to verify
@@ -20,8 +20,6 @@ values.
     Test results are stored in
     `build logs from FD.io dpdk performance job 3n-icx`_,
     `build logs from FD.io dpdk performance job 2n-icx`_,
-    `build logs from FD.io dpdk performance job 3n-skx`_,
-    `build logs from FD.io dpdk performance job 2n-skx`_,
     `build logs from FD.io dpdk performance job 2n-clx`_,
     `build logs from FD.io dpdk performance job 2n-zn2`_,
     `build logs from FD.io dpdk performance job 3n-tsh`_,
@@ -76,52 +74,6 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-icx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-icx-4t2c-pdr.csv>`_
 
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.txt>`_
-  - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-ndr.csv>`_
-  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.txt>`_
-  - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.csv>`_
-  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.csv>`_
-
-2n-skx-xxv710
-~~~~~~~~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.txt>`_
-  - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-ndr.csv>`_
-  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.txt>`_
-  - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.csv>`_
-  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/dpdk_performance_tests/comparisons/index.rst b/docs/report/dpdk_performance_tests/comparisons/index.rst
index d80364c627..ee4cf77080 100644
--- a/docs/report/dpdk_performance_tests/comparisons/index.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/index.rst
@@ -10,7 +10,3 @@ Comparisons
 
     current_vs_previous_release
     2n-clx_vs_2n-icx_testbeds
-    2n-icx_vs_2n-skx_testbeds
-    3n-skx_vs_3n-icx_testbeds
-    2n-skx_vs_2n-clx_testbeds
-    3n-skx_vs_2n-skx_testbeds
diff --git a/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst b/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst
deleted file mode 100644
index 61baf8fcbf..0000000000
--- a/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-2n-skx
-======
-
diff --git a/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst b/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst
deleted file mode 100644
index 60840bbb1e..0000000000
--- a/docs/report/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-3n-skx
-======
-
diff --git a/docs/report/dpdk_performance_tests/packet_latency/2n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/packet_latency/2n-skx-xxv710.rst
deleted file mode 100644
index d5b2083af1..0000000000
--- a/docs/report/dpdk_performance_tests/packet_latency/2n-skx-xxv710.rst
+++ /dev/null
@@ -1,78 +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-skx-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_latency/3n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/packet_latency/3n-skx-xxv710.rst
deleted file mode 100644
index dfb71af036..0000000000
--- a/docs/report/dpdk_performance_tests/packet_latency/3n-skx-xxv710.rst
+++ /dev/null
@@ -1,78 +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-skx-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-testpmd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-l3fwd}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_latency/index.rst b/docs/report/dpdk_performance_tests/packet_latency/index.rst
index 623111ada5..455985a2de 100644
--- a/docs/report/dpdk_performance_tests/packet_latency/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_latency/index.rst
@@ -8,8 +8,8 @@ Packet Latency
 
 DPDK Testpmd and L3fwd latency results are generated based on the test
 data obtained from |csit-release| NDR-PDR throughput tests executed
-across physical testbeds hosted in LF FD.io labs: 2n-icx, 3n-icx, 2n-skx,
-3n-skx, 2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
+across physical testbeds hosted in LF FD.io labs: 2n-icx, 3n-icx,
+2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
 
 Latency by percentile distribution plots are used to show packet latency
 percentiles at different packet rate load levels: i) No-Load latency
@@ -37,8 +37,6 @@ Additional information about graph data:
     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`_,
     `build logs from FD.io dpdk performance job 2n-zn2`_,
     `build logs from FD.io dpdk performance job 3n-alt`_,
@@ -52,8 +50,6 @@ Additional information about graph data:
 
     2n-icx-xxv710
     3n-icx-xxv710
-    2n-skx-xxv710
-    3n-skx-xxv710
     2n-clx-xxv710
     2n-zn2-xxv710
     3n-alt-xl710
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-x710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-x710.rst
deleted file mode 100644
index 95ce045dbe..0000000000
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-x710.rst
+++ /dev/null
@@ -1,125 +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-skx-x710
-~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-x710-64b-2t1c-base-ndr.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]{2n-skx-x710-64b-2t1c-base-ndr}
-            \label{fig:2n-skx-x710-64b-2t1c-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/dpdk/2n-skx-x710-64b-2t1c-base-pdr.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]{2n-skx-x710-64b-2t1c-base-pdr}
-            \label{fig:2n-skx-x710-64b-2t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-x710-64b-4t2c-base-ndr.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]{2n-skx-x710-64b-4t2c-base-ndr}
-            \label{fig:2n-skx-x710-64b-4t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-x710-64b-4t2c-base-pdr.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]{2n-skx-x710-64b-4t2c-base-pdr}
-            \label{fig:2n-skx-x710-64b-4t2c-base-pdr}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-xxv710.rst
deleted file mode 100644
index cb5c260b5f..0000000000
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-skx-xxv710.rst
+++ /dev/null
@@ -1,125 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-xxv710-64b-2t1c-base-ndr.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]{2n-skx-xxv710-64b-2t1c-base-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-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/dpdk/2n-skx-xxv710-64b-2t1c-base-pdr.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]{2n-skx-xxv710-64b-2t1c-base-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-xxv710-64b-4t2c-base-ndr.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]{2n-skx-xxv710-64b-4t2c-base-ndr}
-            \label{fig:2n-skx-xxv710-64b-4t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-xxv710-64b-4t2c-base-pdr.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]{2n-skx-xxv710-64b-4t2c-base-pdr}
-            \label{fig:2n-skx-xxv710-64b-4t2c-base-pdr}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-x710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-x710.rst
deleted file mode 100644
index 71e2b68588..0000000000
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-x710.rst
+++ /dev/null
@@ -1,125 +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-skx-x710
-~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-x710-64b-2t1c-base-ndr.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-skx-x710-64b-2t1c-base-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-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/dpdk/3n-skx-x710-64b-2t1c-base-pdr.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-skx-x710-64b-2t1c-base-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-x710-64b-4t2c-base-ndr.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-skx-x710-64b-4t2c-base-ndr}
-            \label{fig:3n-skx-x710-64b-4t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-x710-64b-4t2c-base-pdr.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-skx-x710-64b-4t2c-base-pdr}
-            \label{fig:3n-skx-x710-64b-4t2c-base-pdr}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-xxv710.rst
deleted file mode 100644
index 4b815ab6d3..0000000000
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/3n-skx-xxv710.rst
+++ /dev/null
@@ -1,125 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-xxv710-64b-2t1c-base-ndr.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-skx-xxv710-64b-2t1c-base-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-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/dpdk/3n-skx-xxv710-64b-2t1c-base-pdr.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-skx-xxv710-64b-2t1c-base-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-xxv710-64b-4t2c-base-ndr.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-skx-xxv710-64b-4t2c-base-ndr}
-            \label{fig:3n-skx-xxv710-64b-4t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/3n-skx-xxv710-64b-4t2c-base-pdr.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-skx-xxv710-64b-4t2c-base-pdr}
-            \label{fig:3n-skx-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 653586a65d..dcfae4e680 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
@@ -8,7 +8,7 @@ Packet Throughput
 
 Throughput graphs are generated by multiple executions of the same
 performance tests across physical testbeds hosted LF FD.io labs:
-2n-icx, 3n-icx, 2n-skx, 3n-skx, 2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
+2n-icx, 3n-icx, 2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
 Box-and-Whisker plots are used to display variations in
 measured throughput values, without making any assumptions of the
 underlying statistical distribution.
@@ -47,8 +47,6 @@ Additional information about graph data:
     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`_,
     `build logs from FD.io dpdk performance job 2n-zn2`_,
     `build logs from FD.io dpdk performance job 3n-alt`_,
@@ -65,10 +63,6 @@ Additional information about graph data:
 
     2n-icx-xxv710
     3n-icx-xxv710
-    2n-skx-xxv710
-    2n-skx-x710
-    3n-skx-xxv710
-    3n-skx-x710
     2n-clx-xxv710
     2n-clx-x710
     2n-zn2-xxv710
diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 694bbc9904..95bbd9d621 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -53,8 +53,6 @@ Startup command template:
 
 .. include:: ../introduction/test_environment_sut_calib_icx.rst
 
-.. include:: ../introduction/test_environment_sut_calib_skx.rst
-
 .. include:: ../introduction/test_environment_sut_calib_clx.rst
 
 .. include:: ../introduction/test_environment_sut_calib_hsw.rst
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-x710.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-x710.rst
deleted file mode 100644
index 89229c6a05..0000000000
--- a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-x710.rst
+++ /dev/null
@@ -1,78 +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-skx-x710
-~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-x710-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]{2n-skx-x710-64b-base-ndr-tsa}
-            \label{fig:2n-skx-x710-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/2n-skx-x710-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]{2n-skx-x710-64b-base-pdr-tsa}
-            \label{fig:2n-skx-x710-64b-base-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-xxv710.rst
deleted file mode 100644
index e09f40091c..0000000000
--- a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/2n-skx-xxv710.rst
+++ /dev/null
@@ -1,78 +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-skx-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=rls2206>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-skx-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]{2n-skx-xxv710-64b-base-ndr-tsa}
-            \label{fig:2n-skx-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/2n-skx-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]{2n-skx-xxv710-64b-base-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-base-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-x710.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-x710.rst
deleted file mode 100644
index 3a5a2a34ae..0000000000
--- a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-x710.rst
+++ /dev/null
@@ -1,78 +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-skx-x710
-~~~~~~~~~~~
-
-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=rls2206>`_.
-
-.. 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-skx-x710-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-skx-x710-64b-base-ndr-tsa}
-            \label{fig:3n-skx-x710-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-skx-x710-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-skx-x710-64b-base-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-base-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-xxv710.rst b/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-xxv710.rst
deleted file mode 100644
index ef3e00124b..0000000000
--- a/docs/report/dpdk_performance_tests/throughput_speedup_multi_core/3n-skx-xxv710.rst
+++ /dev/null
@@ -1,78 +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-skx-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=rls2206>`_.
-
-.. 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-skx-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-skx-xxv710-64b-base-ndr-tsa}
-            \label{fig:3n-skx-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-skx-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-skx-xxv710-64b-base-pdr-tsa}
-            \label{fig:3n-skx-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 8c5f95221e..b911ac71e6 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
@@ -10,7 +10,7 @@ Speedup Multi-Core
 
 Speedup Multi-Core throughput graphs are generated by multiple
 executions of the same performance tests across physical testbeds hosted
-LF FD.io labs: 2n-skx, 3n-skx, 2n-clx, 3n-tsh, 2n-tx2, 2n-zn2.
+LF FD.io labs: 2n-icx, 3n-icx, 2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
 Grouped bars illustrate the 64B packet throughput speedup ratio for
 2- and 4-core multi-threaded DPDK configurations relative to 1-core
 configurations.
@@ -39,8 +39,6 @@ Additional information about graph data:
     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`_,
     `build logs from FD.io dpdk performance job 2n-zn2`_,
     `build logs from FD.io dpdk performance job 3n-alt`_,
@@ -56,10 +54,6 @@ Additional information about graph data:
 
     2n-icx-xxv710
     3n-icx-xxv710
-    2n-skx-xxv710
-    2n-skx-x710
-    3n-skx-xxv710
-    3n-skx-x710
     2n-clx-xxv710
     2n-clx-x710
     2n-zn2-xxv710
diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index 8091ab7dcc..35414ee14c 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -43,16 +43,17 @@ CSIT-2206
     dpdk_performance_tests/throughput_trending
     dpdk_performance_tests/test_environment
 
-.. toctree::
-    :maxdepth: 2
-    :caption: TRex Performance
-
-    trex_performance_tests/overview
-    trex_performance_tests/csit_release_notes
-    trex_performance_tests/packet_throughput_graphs/index
-    trex_performance_tests/packet_latency/index
-    trex_performance_tests/throughput_trending
-    trex_performance_tests/test_environment
+..
+    .. toctree::
+        :maxdepth: 2
+        :caption: TRex Performance
+
+        trex_performance_tests/overview
+        trex_performance_tests/csit_release_notes
+        trex_performance_tests/packet_throughput_graphs/index
+        trex_performance_tests/packet_latency/index
+        trex_performance_tests/throughput_trending
+        trex_performance_tests/test_environment
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template
index 0daf3f137b..ca1fc1b157 100644
--- a/docs/report/index.pdf.template
+++ b/docs/report/index.pdf.template
@@ -7,6 +7,8 @@ CSIT-2206
     introduction/index
     vpp_performance_tests/index
     dpdk_performance_tests/index
-    trex_performance_tests/index
     vpp_device_tests/index
     csit_framework_documentation/index
+
+..
+    trex_performance_tests/index
diff --git a/docs/report/introduction/methodology_ipsec.rst b/docs/report/introduction/methodology_ipsec.rst
index a168e238ee..145836a3b7 100644
--- a/docs/report/introduction/methodology_ipsec.rst
+++ b/docs/report/introduction/methodology_ipsec.rst
@@ -24,7 +24,7 @@ on VPP native crypto (`crypto_native` plugin):
 +-------------------+------------------+----------------+------------------+
 
 VPP IPsec with SW crypto are executed in both tunnel and policy modes,
-with tests running on 3-node testbeds: 3n-skx, 3n-tsh.
+with tests running on 3-node testbeds: 3n-icx, 3n-tsh.
 
 IPsec with Intel QAT HW
 ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/report/introduction/methodology_multi_core_speedup.rst b/docs/report/introduction/methodology_multi_core_speedup.rst
index 05307549f4..d9515faf43 100644
--- a/docs/report/introduction/methodology_multi_core_speedup.rst
+++ b/docs/report/introduction/methodology_multi_core_speedup.rst
@@ -26,7 +26,7 @@ Multi-core Tests
 |csit-release| multi-core tests are executed in the following VPP worker
 thread and physical core configurations:
 
-#. Intel Xeon Skylake and Cascadelake testbeds (2n-skx, 3n-skx, 2n-clx)
+#. Intel Xeon Icelake and Cascadelake testbeds (2n-icx, 3n-icx, 2n-clx)
    with Intel HT enabled (2 logical CPU cores per each physical core):
 
   #. 2t1c - 2 VPP worker threads on 1 physical core.
diff --git a/docs/report/introduction/methodology_rca/methodology_perpatch_performance_tests.rst b/docs/report/introduction/methodology_rca/methodology_perpatch_performance_tests.rst
index a3fb4c5938..97c5e091ff 100644
--- a/docs/report/introduction/methodology_rca/methodology_perpatch_performance_tests.rst
+++ b/docs/report/introduction/methodology_rca/methodology_perpatch_performance_tests.rst
@@ -18,7 +18,7 @@ There are jobs available for multiple types of testbeds,
 based on various processors.
 Their Gerrit triggers words are of the form "perftest-{node_arch}"
 where the node_arch combinations currently supported are:
-2n-clx, 2n-dnv, 2n-skx, 2n-tx2, 2n-zn2, 3n-dnv, 3n-skx, 3n-tsh.
+2n-clx, 2n-dnv, 2n-tx2, 2n-zn2, 3n-dnv, 3n-tsh.
 
 Test selection
 --------------
@@ -47,12 +47,12 @@ to trigger more runs for the same job, until Gerrit is done waiting.
 After Gerrit is done waiting, it becames possible to trigger
 the same job again.
 
-Example. User triggers one set of tests on 2n-skx and immediately
-also triggers other set of tests on 3n-skx. Then the user notices
-2n-skx run end early because of a typo in tag expression.
-When the user tries to re-trigger 2n-skx (with fixed tag expression),
+Example. User triggers one set of tests on 2n-icx and immediately
+also triggers other set of tests on 3n-icx. Then the user notices
+2n-icx run end early because of a typo in tag expression.
+When the user tries to re-trigger 2n-icx (with fixed tag expression),
 that comment gets ignored by Jenkins.
-Only when 3n-skx job finishes, the user can trigger 2n-skx.
+Only when 3n-icx job finishes, the user can trigger 2n-icx.
 
 One comment many jobs
 _____________________
@@ -73,7 +73,7 @@ so the OR operator is not very useful. It is recommended
 to use space instead of OR operator.
 
 Example template:
-perftest-2n-skx {tag_expression_1} {tag_expression_2}
+perftest-2n-icx {tag_expression_1} {tag_expression_2}
 
 See below for more concrete examples.
 
@@ -124,7 +124,7 @@ and more for dot1q and other encapsulated traffic;
 As there are more test cases than CSIT can periodically test,
 it is possible to encounter an old test case that currently fails.
 To avoid that, you can look at "job spec" files we use for periodic testing,
-for example `this one <https://github.com/FDio/csit/blob/master/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md>`_.
+for example `this one <https://github.com/FDio/csit/blob/master/docs/job_specs/report_iterative/2n-icx/vpp-mrr-00.md>`_.
 
 ..
     TODO: Explain why "periodic" job spec link lands at report_iterative.
@@ -164,10 +164,10 @@ available (1 or 2).
 
 As not all NICs and testbeds offer enogh ports for 2 parallel DUT-DUT links,
 the user looks at `testbed specifications <https://github.com/FDio/csit/tree/master/topologies/available>`_
-and finds that only x710 NIC on 3n-skx testbed matches the requirements.
+and finds that only xxv710 NIC on 3n-icx testbed matches the requirements.
 Quick look into the suites confirm the smallest frame size is 64 bytes
 (despite DOT1Q robot tag, as the encapsulation does not happen on TG-DUT links).
-It is ok to use just 1 physical core, as 3n-skx has hyperthreading enabled,
+It is ok to use just 1 physical core, as 3n-icx has hyperthreading enabled,
 so VPP vswitch will use 2 worker threads.
 
 The user decides the vswitch forwarding mode is not important
@@ -176,7 +176,7 @@ but wants to test both NIC drivers (not AF_XDP), both apps in VM,
 and both 1 and 2 parallel links.
 
 After shortening, this is the trigger comment fianlly used:
-perftest-3n-skx mrrANDnic_intel-x710AND1cAND64bAND?lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm*NOTdrv_af_xdp
+perftest-3n-icx mrrANDnic_intel-x710AND1cAND64bAND?lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm*NOTdrv_af_xdp
 
 Basic operation
 ```````````````
diff --git a/docs/report/introduction/physical_testbeds.rst b/docs/report/introduction/physical_testbeds.rst
index d265efda03..343e4b3010 100644
--- a/docs/report/introduction/physical_testbeds.rst
+++ b/docs/report/introduction/physical_testbeds.rst
@@ -230,100 +230,6 @@ SUT and TG NICs:
 All Intel Xeon Icelake servers run with Intel Hyper-Threading enabled,
 doubling the number of logical cores exposed to Linux.
 
-2-Node Xeon Skylake (2n-skx)
-----------------------------
-
-Four 2n-skx testbeds are in operation in FD.io labs. Each 2n-skx testbed
-is built with two SuperMicro SYS-7049GP-TRT servers, each in turn
-equipped with two Intel Xeon Skylake Platinum 8180 processors (38.5 MB
-Cache, 2.50 GHz, 28 cores). 2n-skx physical topology is shown below.
-
-.. only:: latex
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_tmp/src/introduction/}}
-                \includegraphics[width=0.90\textwidth]{testbed-2n-skx}
-                \label{fig:testbed-2n-skx}
-        \end{figure}
-
-.. only:: html
-
-    .. figure:: testbed-2n-skx.svg
-        :alt: testbed-2n-skx
-        :align: center
-
-SUT NICs:
-
-#. NIC-1: x710-DA4 4p10GE Intel.
-#. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: empty, future expansion.
-#. NIC-4: empty, future expansion.
-#. NIC-5: empty, future expansion.
-#. NIC-6: empty, future expansion.
-
-TG NICs:
-
-#. NIC-1: x710-DA4 4p10GE Intel.
-#. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: empty, future expansion.
-#. NIC-4: empty, future expansion.
-#. NIC-5: empty, future expansion.
-#. NIC-6: x710-DA4 4p10GE Intel. (For self-tests.)
-
-All Intel Xeon Skylake servers run with Intel Hyper-Threading enabled,
-doubling the number of logical cores exposed to Linux, with 56 logical
-cores and 28 physical cores per processor socket.
-
-3-Node Xeon Skylake (3n-skx)
-----------------------------
-
-Two 3n-skx testbeds are in operation in FD.io labs. Each 3n-skx testbed
-is built with three SuperMicro SYS-7049GP-TRT servers, each in turn
-equipped with two Intel Xeon Skylake Platinum 8180 processors (38.5 MB
-Cache, 2.50 GHz, 28 cores). 3n-skx physical topology is shown below.
-
-.. only:: latex
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_tmp/src/introduction/}}
-                \includegraphics[width=0.90\textwidth]{testbed-3n-skx}
-                \label{fig:testbed-3n-skx}
-        \end{figure}
-
-.. only:: html
-
-    .. figure:: testbed-3n-skx.svg
-        :alt: testbed-3n-skx
-        :align: center
-
-SUT1 and SUT2 NICs:
-
-#. NIC-1: x710-DA4 4p10GE Intel.
-#. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: empty, future expansion.
-#. NIC-4: empty, future expansion.
-#. NIC-5: empty, future expansion.
-#. NIC-6: empty, future expansion.
-
-TG NICs:
-
-#. NIC-1: x710-DA4 4p10GE Intel.
-#. NIC-2: xxv710-DA2 2p25GE Intel.
-#. NIC-3: empty, future expansion.
-#. NIC-4: empty, future expansion.
-#. NIC-5: empty, future expansion.
-#. NIC-6: x710-DA4 4p10GE Intel. (For self-tests.)
-
-All Intel Xeon Skylake servers run with Intel Hyper-Threading enabled,
-doubling the number of logical cores exposed to Linux, with 56 logical
-cores and 28 physical cores per processor socket.
-
 2-Node Atom Denverton (2n-dnv)
 ------------------------------
 
diff --git a/docs/report/stats/durations.rst b/docs/report/stats/durations.rst
index 952ff72fb3..b493ef034a 100644
--- a/docs/report/stats/durations.rst
+++ b/docs/report/stats/durations.rst
@@ -25,12 +25,6 @@ Job Durations
   - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-2n-dnv-iter.txt>`_
   - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-2n-dnv-cov.txt>`_
 
-2n-skx
-------
-
-  - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-2n-skx-iter.txt>`_
-  - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-2n-skx-cov.txt>`_
-
 2n-tx2
 ------
 
@@ -55,12 +49,6 @@ Job Durations
   - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-3n-dnv-iter.txt>`_
   - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-3n-dnv-cov.txt>`_
 
-3n-skx
-------
-
-  - `ASCII Iterative jobs <../_static/vpp/job-spec-duration-3n-skx-iter.txt>`_
-  - `ASCII Coverage jobs <../_static/vpp/job-spec-duration-3n-skx-cov.txt>`_
-
 3n-tsh
 ------
 
diff --git a/docs/report/test_configuration/vpp_mrr_configuration/index.rst b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
index d25bd8cb9f..7aac9e47b1 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
@@ -6,8 +6,6 @@ VPP MRR
     Data sources for reported test results:
     i) `build logs from FD.io vpp iterative job 2n-icx`_,
     `build logs from FD.io vpp iterative job 3n-icx`_,
-    `build logs from FD.io vpp iterative job 2n-skx`_,
-    `build logs from FD.io vpp iterative job 3n-skx`_,
     `build logs from FD.io vpp iterative job 2n-clx`_,
     `build logs from FD.io vpp iterative job 2n-zn2`_,
     `build logs from FD.io vpp iterative job 3n-alt`_,
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
deleted file mode 100644
index 55865b7f4e..0000000000
--- a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test configurations:
-    i) `build logs from FD.io vpp coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
deleted file mode 100644
index ba114fea25..0000000000
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test configurations:
-    i) `build logs from FD.io vpp coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/test_configuration/vpp_performance_configuration/index.rst b/docs/report/test_configuration/vpp_performance_configuration/index.rst
index 63d51497c2..12cc29f82f 100644
--- a/docs/report/test_configuration/vpp_performance_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration/index.rst
@@ -6,8 +6,6 @@ VPP Throughput
     Data sources for reported test results:
     i) `build logs from FD.io vpp coverage job 2n-icx`_,
     `build logs from FD.io vpp coverage job 3n-icx`_,
-    `build logs from FD.io vpp coverage job 2n-skx`_,
-    `build logs from FD.io vpp coverage job 3n-skx`_,
     `build logs from FD.io vpp coverage job 2n-clx`_,
     `build logs from FD.io vpp coverage job 2n-zn2`_,
     `build logs from FD.io vpp coverage job 3n-alt`_,
diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
deleted file mode 100644
index 55865b7f4e..0000000000
--- a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test configurations:
-    i) `build logs from FD.io vpp coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
deleted file mode 100644
index ba114fea25..0000000000
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test configurations:
-    i) `build logs from FD.io vpp coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
index 923a590a12..275e31ab09 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
@@ -2,8 +2,8 @@ VPP Throughput
 ==============
 
 VPP operational data is generated by |csit-release| NDR-PDR throughput tests
-executed across physical testbeds hosted in LF FD.io labs: 3n-skx,
-2n-skx, 2n-clx, 3n-dnv, 2n-dnv, 3n-alt, 3n-tsh, 2n-tx2. The data is collected
+executed across physical testbeds hosted in LF FD.io labs:
+2n-clx, 3n-dnv, 2n-dnv, 3n-alt, 3n-tsh, 2n-tx2. The data is collected
 at 100% PDR.
 
 .. note::
@@ -11,8 +11,6 @@ at 100% PDR.
     Data sources for reported test results:
     i) `build logs from FD.io vpp coverage job 2n-icx`_,
     `build logs from FD.io vpp coverage job 3n-icx`_,
-    `build logs from FD.io vpp coverage job 2n-skx`_,
-    `build logs from FD.io vpp coverage job 3n-skx`_,
     `build logs from FD.io vpp coverage job 2n-clx`_,
     `build logs from FD.io vpp coverage job 2n-zn2`_,
     `build logs from FD.io vpp coverage job 3n-alt`_,
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
deleted file mode 100644
index 3fc8fb7775..0000000000
--- a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-2n-skx
-------
-
-.. note::
-
-    Data sources for reported test operational data:
-    i) `build logs from FD.io vpp coverage job 2n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
deleted file mode 100644
index 16ab9c397d..0000000000
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-3n-skx
-------
-
-.. note::
-
-    Data sources for reported test operational data:
-    i) `build logs from FD.io vpp coverage job 3n-skx`_,
-    ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
deleted file mode 100644
index d1cc872954..0000000000
--- a/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-2n-Icx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |vpp-release| packet throughput (NDR, PDR and
-MRR) is calculated for the same tests executed on 2-Node Cascadelake (2n-
-skx) and 2-Node Icelake (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 vpp performance job 2n-icx`_ and
-    `build logs from FD.io vpp performance job 2n-skx`_
-    with RF result
-    files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-NDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c NDR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-ndr.html>`_
-  - `HTML 2c NDR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-ndr.html>`_
-  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr.txt>`_
-  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr.txt>`_
-  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr-csv.csv>`_
-  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr-csv.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c PDR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-pdr.html>`_
-  - `HTML 2c PDR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-pdr.html>`_
-  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr.txt>`_
-  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr.txt>`_
-  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr-csv.csv>`_
-  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr-csv.csv>`_
-
-MRR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-mrr.html>`_
-  - `HTML 2c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-mrr.html>`_
-  - `HTML 4c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-4c-mrr.html>`_
-  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr.txt>`_
-  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr.txt>`_
-  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr.txt>`_
-  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr-csv.csv>`_
-  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr-csv.csv>`_
-  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
deleted file mode 100644
index 89145ff823..0000000000
--- a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-2n-Clx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |vpp-release| packet throughput (NDR, PDR and
-MRR) is calculated for the same tests executed on 2-Node Skylake (2n-
-skx) and 2-Node Cascade Lake (2n-clx) physical testbed types, in 1-core,
-2-core and 4-core configurations.
-
-.. note::
-
-    Test results are stored in
-    `build logs from FD.io vpp performance job 2n-skx`_ and
-    `build logs from FD.io vpp performance job 2n-clx`_
-    with RF result files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-NDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c NDR comparison <performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.html>`_
-  - `HTML 2c NDR comparison <performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.html>`_
-  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.txt>`_
-  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.txt>`_
-  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr-csv.csv>`_
-  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr-csv.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c PDR comparison <performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr.html>`_
-  - `HTML 2c PDR comparison <performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr.html>`_
-  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr.txt>`_
-  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr.txt>`_
-  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr-csv.csv>`_
-  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr-csv.csv>`_
-
-MRR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c MRR comparison <performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr.html>`_
-  - `HTML 2c MRR comparison <performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr.html>`_
-  - `HTML 4c MRR comparison <performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr.html>`_
-  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr.txt>`_
-  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr.txt>`_
-  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr.txt>`_
-  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr-csv.csv>`_
-  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr-csv.csv>`_
-  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
deleted file mode 100644
index f929d1bfaf..0000000000
--- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-
-.. _vpp_compare_topologies_3n-Skx_vs_2n-Skx:
-
-3n-Skx vs 2n-Skx Testbeds
--------------------------
-
-Relative comparison of |vpp-release| packet throughput (NDR, PDR and
-MRR) is calculated for the same tests executed on 3-Node Skylake (3n-
-skx) and 2-Node Skylake (2n-skx) physical testbed types, in 1-core,
-2-core and 4-core configurations.
-
-.. note::
-
-    Test results are stored in
-    `build logs from FD.io vpp performance job 3n-skx`_ and
-    `build logs from FD.io vpp performance job 2n-skx`_
-    with RF result
-    files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-NDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c NDR comparison <performance-compare-topologies-3n-skx-2n-skx-1c-ndr.html>`_
-  - `HTML 2c NDR comparison <performance-compare-topologies-3n-skx-2n-skx-2c-ndr.html>`_
-  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.txt>`_
-  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.txt>`_
-  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr-csv.csv>`_
-  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr-csv.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c PDR comparison <performance-compare-topologies-3n-skx-2n-skx-1c-pdr.html>`_
-  - `HTML 2c PDR comparison <performance-compare-topologies-3n-skx-2n-skx-2c-pdr.html>`_
-  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-pdr.txt>`_
-  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-pdr.txt>`_
-  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-pdr-csv.csv>`_
-  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-pdr-csv.csv>`_
-
-MRR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c MRR comparison <performance-compare-topologies-3n-skx-2n-skx-1c-mrr.html>`_
-  - `HTML 2c MRR comparison <performance-compare-topologies-3n-skx-2n-skx-2c-mrr.html>`_
-  - `HTML 4c MRR comparison <performance-compare-topologies-3n-skx-2n-skx-4c-mrr.html>`_
-  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-mrr.txt>`_
-  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-mrr.txt>`_
-  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-4c-mrr.txt>`_
-  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-mrr-csv.csv>`_
-  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-mrr-csv.csv>`_
-  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-4c-mrr-csv.csv>`_
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
deleted file mode 100644
index 593924ea19..0000000000
--- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-
-.. _vpp_compare_topologies_3n-skx_vs_3n-icx:
-
-3n-Icx vs 3n-Skx Testbeds
--------------------------
-
-Relative comparison of |vpp-release| packet throughput (NDR, PDR and
-MRR) is calculated for the same tests executed on 3-Node Skylake (3n-
-skx) and 3-Node Icelake (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 vpp performance job 3n-skx`_ and
-    `build logs from FD.io vpp performance job 3n-icx`_
-    with RF result
-    files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-NDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c NDR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-ndr.html>`_
-  - `HTML 2c NDR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-ndr.html>`_
-  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr.txt>`_
-  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr.txt>`_
-  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr-csv.csv>`_
-  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr-csv.csv>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 1c PDR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-pdr.html>`_
-  - `HTML 2c PDR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-pdr.html>`_
-  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr.txt>`_
-  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr.txt>`_
-  - `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>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
index 9418bd1988..e73d2b050e 100644
--- a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
+++ b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
@@ -7,8 +7,7 @@ Current vs Previous Release
 Relative comparison of VPP packet throughput (NDR, PDR and MRR) between
 |vpp-release| and |vpp-release-1| (measured for |csit-release| and
 |csit-release-1| respectively) is calculated from results of tests
-running on 2-node Intel Xeon Skylake (2n-skx), 3-node Intel Xeon Skylake
-(3n-skx), 2-node Intel Atom Denverton
+running on 2-node Intel Atom Denverton
 (2n-dnv), 3-node Intel Atom Denverton (3n-dnv), 3-node Arm TaiShan (3n-tsh)
 testbeds, in 1-core, 2-core and 4-core (MRR only) configurations.
 
@@ -27,8 +26,6 @@ results repeatability vary between the test cases.
 
     - `build logs from FD.io vpp performance job 2n-icx`_,
     - `build logs from FD.io vpp performance job 3n-icx`_,
-    - `build logs from FD.io vpp performance job 2n-skx`_,
-    - `build logs from FD.io vpp performance job 3n-skx`_,
     - `build logs from FD.io vpp performance job 2n-clx`_,
     - `build logs from FD.io vpp performance job 2n-zn2`_,
     - `build logs from FD.io vpp performance job 2n-dnv`_,
@@ -154,120 +151,6 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-icx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_
   - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-icx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_
 
-2n-skx-xxv710
-~~~~~~~~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c NDR comparison <performance-changes-2n-skx-2t1c-ndr.html>`_
-  - `HTML 4t2c NDR comparison <performance-changes-2n-skx-4t2c-ndr.html>`_
-  - `ASCII 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr.txt>`_
-  - `CSV 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr-csv.csv>`_
-  - `CSV 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr-csv.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR comparison <performance-changes-2n-skx-2t1c-pdr.html>`_
-  - `HTML 4t2c PDR comparison <performance-changes-2n-skx-4t2c-pdr.html>`_
-  - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.txt>`_
-  - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr-csv.csv>`_
-  - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr-csv.csv>`_
-
-MRR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c MRR comparison <performance-changes-2n-skx-2t1c-mrr.html>`_
-  - `HTML 4t2c MRR comparison <performance-changes-2n-skx-4t2c-mrr.html>`_
-  - `HTML 8t4c MRR comparison <performance-changes-2n-skx-8t4c-mrr.html>`_
-  - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.txt>`_
-  - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.txt>`_
-  - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.txt>`_
-  - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr-csv.csv>`_
-  - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr-csv.csv>`_
-  - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr-csv.csv>`_
-
-Latency Comparison
-``````````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR50, direction1, average value comparison <latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg.html>`_
-  - `HTML 2t1c PDR90, direction1, average value comparison <latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg.html>`_
-  - `HTML 2t1c PDR90, direction1, max value comparison <latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max.html>`_
-  - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_
-  - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_
-  - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_
-  - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_
-  - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_
-  - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_
-
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c NDR comparison <performance-changes-3n-skx-2t1c-ndr.html>`_
-  - `HTML 4t2c NDR comparison <performance-changes-3n-skx-4t2c-ndr.html>`_
-  - `ASCII 2t1c NDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t2c NDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-ndr.txt>`_
-  - `CSV 2t1c NDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-ndr-csv.csv>`_
-  - `CSV 4t2c NDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-ndr-csv.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR comparison <performance-changes-3n-skx-2t1c-pdr.html>`_
-  - `HTML 4t2c PDR comparison <performance-changes-3n-skx-4t2c-pdr.html>`_
-  - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.txt>`_
-  - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr-csv.csv>`_
-  - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr-csv.csv>`_
-
-MRR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c MRR comparison <performance-changes-3n-skx-2t1c-mrr.html>`_
-  - `HTML 4t2c MRR comparison <performance-changes-3n-skx-4t2c-mrr.html>`_
-  - `HTML 8t4c MRR comparison <performance-changes-3n-skx-8t4c-mrr.html>`_
-  - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.txt>`_
-  - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.txt>`_
-  - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.txt>`_
-  - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr-csv.csv>`_
-  - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr-csv.csv>`_
-  - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr-csv.csv>`_
-
-Latency Comparison
-``````````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR50, direction1, average value comparison <latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg.html>`_
-  - `HTML 2t1c PDR90, direction1, average value comparison <latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg.html>`_
-  - `HTML 2t1c PDR90, direction1, max value comparison <latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max.html>`_
-  - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_
-  - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_
-  - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_
-  - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_
-  - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_
-  - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_
-
 Hoststack
 `````````
 
diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index 3b84884e40..9569e27ed1 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -12,9 +12,5 @@ Comparisons
 
     current_vs_previous_release
     2n-clx_vs_2n-icx_testbeds
-    2n-icx_vs_2n-skx_testbeds
-    2n-skx_vs_2n-clx_testbeds
-    3n-skx_vs_3n-icx_testbeds
-    3n-skx_vs_2n-skx_testbeds
     nic_comparison
     soak_vs_ndr
diff --git a/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst b/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
index 5334753b97..9186ec556a 100644
--- a/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
+++ b/docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
@@ -21,92 +21,92 @@ results repeatability vary between the test cases.
 
     Test results are stored in
 
-    - `build logs from FD.io vpp performance job 3n-skx`_,
-    - `build logs from FD.io vpp performance job 2n-skx`_
+    -
 
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-3n-skx
-~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-ndr.html>`_
-  - `HTML 4t2c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-ndr.html>`_
-  - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-ndr.txt>`_
-  - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-ndr.txt>`_
-  - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-ndr-csv.csv>`_
-  - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-ndr-csv.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-pdr.html>`_
-  - `HTML 4t2c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-pdr.html>`_
-  - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-pdr.txt>`_
-  - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-pdr.txt>`_
-  - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-pdr-csv.csv>`_
-  - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-pdr-csv.csv>`_
-
-MRR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-mrr.html>`_
-  - `HTML 4t2c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-mrr.html>`_
-  - `HTML 8t4c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-8t4c-nics-mrr.html>`_
-  - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.txt>`_
-  - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.txt>`_
-  - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.txt>`_
-  - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr-csv.csv>`_
-  - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr-csv.csv>`_
-  - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr-csv.csv>`_
-
-2n-skx
-~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-ndr.html>`_
-  - `HTML 4t2c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-ndr.html>`_
-  - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.txt>`_
-  - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.txt>`_
-  - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr-csv.csv>`_
-  - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr-csv.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-pdr.html>`_
-  - `HTML 4t2c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-pdr.html>`_
-  - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.txt>`_
-  - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.txt>`_
-  - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr-csv.csv>`_
-  - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr-csv.csv>`_
-
-MRR Comparison
-``````````````
-
-Comparison tables in HTML, ASCII and CSV formats:
-
-  - `HTML 2t1c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-mrr.html>`_
-  - `HTML 4t2c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-mrr.html>`_
-  - `HTML 8t4c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-8t4c-nics-mrr.html>`_
-  - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.txt>`_
-  - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.txt>`_
-  - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.txt>`_
-  - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr-csv.csv>`_
-  - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr-csv.csv>`_
-  - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr-csv.csv>`_
+..
+  3n-skx
+  ~~~~~~
+
+  NDR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-ndr.html>`_
+    - `HTML 4t2c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-ndr.html>`_
+    - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-ndr.txt>`_
+    - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-ndr.txt>`_
+    - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-ndr-csv.csv>`_
+    - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-ndr-csv.csv>`_
+
+  PDR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-pdr.html>`_
+    - `HTML 4t2c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-pdr.html>`_
+    - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-pdr.txt>`_
+    - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-pdr.txt>`_
+    - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-pdr-csv.csv>`_
+    - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-pdr-csv.csv>`_
+
+  MRR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-2t1c-nics-mrr.html>`_
+    - `HTML 4t2c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-4t2c-nics-mrr.html>`_
+    - `HTML 8t4c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-3n-skx-8t4c-nics-mrr.html>`_
+    - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.txt>`_
+    - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.txt>`_
+    - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.txt>`_
+    - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr-csv.csv>`_
+    - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr-csv.csv>`_
+    - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr-csv.csv>`_
+
+  2n-skx
+  ~~~~~~
+
+  NDR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-ndr.html>`_
+    - `HTML 4t2c NDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-ndr.html>`_
+    - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.txt>`_
+    - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.txt>`_
+    - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr-csv.csv>`_
+    - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr-csv.csv>`_
+
+  PDR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-pdr.html>`_
+    - `HTML 4t2c PDR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-pdr.html>`_
+    - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.txt>`_
+    - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.txt>`_
+    - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr-csv.csv>`_
+    - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr-csv.csv>`_
+
+  MRR Comparison
+  ``````````````
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 2t1c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-2t1c-nics-mrr.html>`_
+    - `HTML 4t2c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-4t2c-nics-mrr.html>`_
+    - `HTML 8t4c MRR Intel-x710 and Intel-xxv710 comparison <performance-changes-2n-skx-8t4c-nics-mrr.html>`_
+    - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.txt>`_
+    - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.txt>`_
+    - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.txt>`_
+    - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr-csv.csv>`_
+    - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr-csv.csv>`_
+    - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst b/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst
index 97639c9d0f..de904ffc91 100644
--- a/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst
+++ b/docs/report/vpp_performance_tests/comparisons/soak_vs_ndr.rst
@@ -11,7 +11,6 @@ in 1-core configurations.
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_,
     `build logs from FD.io vpp performance job 2n-clx`_
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -24,12 +23,6 @@ Comparison tables in ASCII and CSV formats:
   - `ASCII Soak vs NDR comparison <../../_static/vpp/soak-vs-ndr-2n-icx.txt>`_
   - `CSV Soak vs NDR comparison <../../_static/vpp/soak-vs-ndr-2n-icx.csv>`_
 
-2n-skx
-~~~~~~
-
-  - `ASCII Soak vs NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.txt>`_
-  - `CSV Soak vs NDR comparison <../../_static/vpp/soak-vs-ndr-2n-skx.csv>`_
-
 2n-clx
 ~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/gso_testing/2n-skx.rst b/docs/report/vpp_performance_tests/gso_testing/2n-skx.rst
deleted file mode 100644
index 55d052537d..0000000000
--- a/docs/report/vpp_performance_tests/gso_testing/2n-skx.rst
+++ /dev/null
@@ -1,96 +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-skx
-~~~~~~
-
-.. todo::
-    Add introduction
-
-.. raw:: latex
-
-    \clearpage
-
-1t1c
-----
-
-.. raw:: html
-
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-128kb-1t1c-ip4routing-iperf3.html"></iframe>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-128kb-1t1c-ip4routing-iperf3}
-            \label{fig:2n-skx-128kb-1t1c-ip4routing-iperf3}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    2t2c
-    ----
-
-    .. raw:: html
-
-        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-128kb-2t2c-ip4routing-iperf3.html"></iframe>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-128kb-2t2c-ip4routing-iperf3}
-                \label{fig:2n-skx-128kb-2t2c-ip4routing-iperf3}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    4t4c
-    ----
-
-    .. raw:: html
-
-        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-128kb-4t4c-ip4routing-iperf3.html"></iframe>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-128kb-4t4c-ip4routing-iperf3}
-                \label{fig:2n-skx-128kb-4t4c-ip4routing-iperf3}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/gso_testing/index.rst b/docs/report/vpp_performance_tests/gso_testing/index.rst
index d7de0b5468..9230170525 100644
--- a/docs/report/vpp_performance_tests/gso_testing/index.rst
+++ b/docs/report/vpp_performance_tests/gso_testing/index.rst
@@ -4,6 +4,5 @@ GSO Testing
 .. toctree::
 
     2n-icx
-    2n-skx
     2n-clx
     2n-zn2
diff --git a/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst b/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst
deleted file mode 100644
index 61baf8fcbf..0000000000
--- a/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-2n-skx
-======
-
diff --git a/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst b/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst
deleted file mode 100644
index 60840bbb1e..0000000000
--- a/docs/report/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs/3n_skx.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-3n-skx
-======
-
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
index 584189ab84..d4f93ba3af 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
@@ -61,7 +61,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_ and
     `build logs from FD.io vpp performance job 2n-clx`_
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -277,213 +276,6 @@ imix-8t4c-eth-l2bd
 
     \clearpage
 
-2n-skx-xxv710-mrr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-ndr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-pdr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 2n-clx-xxv710-mrr
 ~~~~~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains_ipsec.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains_ipsec.rst
deleted file mode 100644
index 67eabcdf33..0000000000
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains_ipsec.rst
+++ /dev/null
@@ -1,611 +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>
-
-.. _cnf_service_chains_ipsec:
-
-CNF Service Chains ipsec
-========================
-
-.. todo::
-
-    Add introduction.
-
-Additional information about graph data:
-
-#. **Graph Title**: describes tested packet path including CNF workload
-   running in each Docker Container.
-
-#. **X-axis Labels**: CNFs per service chain.
-
-#. **Y-axis Labels**: number of service chains.
-
-#. **Z-axis Color Scale**: lists IMIX Packet Throughput
-   (mean MRR/NDR/PDR value) in Mpps or the Relative Difference.
-
-#. **Hover Information**: specific test substring listing
-   memif-chain-docker_container combinations, number of runs executed,
-   mean MRR/NDR/PDR throughput in Mpps, standard deviation for both
-   configurations and their relative difference.
-
-.. note::
-
-    Test results are stored in
-    `build logs from FD.io vpp performance job 3n-skx`_
-    with RF result files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-3n-skx-xxv710-mrr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-mrr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-3n-skx-xxv710-ndr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-ndr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-3n-skx-xxv710-pdr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx4tnl18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx1000tnl18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrmskx10000tnl18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-pdr}
-            \label{fig:l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
index c6adc58f94..2e53c2597d 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
@@ -61,7 +61,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_ and
     `build logs from FD.io vpp performance job 2n-clx`_
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -277,213 +276,6 @@ imix-8t4c-eth-l2bd
 
     \clearpage
 
-2n-skx-xxv710-mrr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-ndr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-pdr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 2n-clx-xxv710-mrr
 ~~~~~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/nf_service_density/index.rst b/docs/report/vpp_performance_tests/nf_service_density/index.rst
index 4d1345a9e3..88ebca6bf6 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/index.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/index.rst
@@ -30,6 +30,3 @@ resources.
     cnf_service_chains
     cnf_service_pipelines
     vnf_service_chains_vxlan
-
-..
-    cnf_service_chains_ipsec
diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
index 5c3d01212a..ee7d99e481 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
@@ -60,7 +60,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_ and
     `build logs from FD.io vpp performance job 2n-clx`_
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -276,213 +275,6 @@ imix-8t4c-eth-l2bd
 
     \clearpage
 
-2n-skx-xxv710-mrr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-ndr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-pdr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 2n-clx-xxv710-mrr
 ~~~~~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
index 0dfa650c90..52f6116847 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
@@ -57,7 +57,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_ and
     `build logs from FD.io vpp performance job 2n-clx`_ with RF
     result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -273,213 +272,6 @@ imix-8t4c-eth-l2bd
 
     \clearpage
 
-2n-skx-xxv710-mrr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-ndr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx-xxv710-pdr
-~~~~~~~~~~~~~~~~~
-
-imix-2t1c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-eth-l2bd
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 2n-clx-xxv710-mrr
 ~~~~~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-skx-xxv710.rst
deleted file mode 100644
index 3a032f4d45..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,154 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-memif-base-avf
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-memif-base-dpdk
-------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2memif-1dcr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-eth-2memif-1dcr" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-eth-2memif-1dcr.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-eth-2memif-1dcr}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base-eth-2memif-1dcr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
index 23c740c667..60d19b1724 100644
--- a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
@@ -12,7 +12,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     container_memif-2n-icx-xxv710
-    container_memif-2n-skx-xxv710
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/index.rst b/docs/report/vpp_performance_tests/packet_latency/index.rst
index 40274b0d06..35184c94e3 100644
--- a/docs/report/vpp_performance_tests/packet_latency/index.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/index.rst
@@ -9,7 +9,7 @@ Packet Latency
 
 VPP latency results are generated based on the test data obtained from
 |csit-release| NDR-PDR throughput tests executed across physical
-testbeds hosted in LF FD.io labs: 2n-icx, 3n-icx, 2n-aws, 2n-skx, 3n-skx,
+testbeds hosted in LF FD.io labs: 2n-icx, 3n-icx, 2n-aws,
 2n-clx, 2n-zn2, 3n-alt, 3n-tsh, 2n-tx2.
 
 Latency by percentile distribution plots are used to show packet latency
@@ -39,8 +39,6 @@ Additional information about graph data:
     `build logs from FD.io vpp performance job 2n-icx`_,
     `build logs from FD.io vpp performance job 3n-icx`_,
     `build logs from FD.io vpp performance job 2n-aws`_,
-    `build logs from FD.io vpp performance job 2n-skx`_,
-    `build logs from FD.io vpp performance job 3n-skx`_,
     `build logs from FD.io vpp performance job 2n-clx`_,
     `build logs from FD.io vpp performance job 2n-zn2`_,
     `build logs from FD.io vpp performance job 3n-alt`_,
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
deleted file mode 100644
index e25ac366bc..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,483 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale200k-rnd}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-af-xdp-ethip4-ip4scale2m-rnd}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-64b-2t1c-ip4routing-base-scale-dpdk
------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-dot1q-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-dot1q-ip4base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-dot1q-ip4base}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-dot1q-ip4base}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale20k-rnd}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-3n-skx-xxv710.rst
deleted file mode 100644
index 4394554637..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,74 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-avf
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-dpdk
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-ethip4-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4base}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4.rst b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
index 9d135b274c..3a4d904a56 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
@@ -13,8 +13,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip4-2n-icx-xxv710
     ip4-3n-icx-xxv710
-    ip4-2n-skx-xxv710
-    ip4-3n-skx-xxv710
     ip4-2n-clx-xxv710
     ip4-2n-clx-cx556a
     ip4-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst
deleted file mode 100644
index cfc6cb1c2c..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,154 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4tunnel-base-avf
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2xcbase.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2xcbase}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4vxlan-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base.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-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
-            \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4gtpusw-ip4base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4tunnel-base-dpdk
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2xcbase.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2xcbase}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2bdbasemaclrn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4vxlan-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base.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-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
-            \label{fig:3n-skx-25ge2p1xxv710-64b-2t1c-ethip4gtpusw-ip4base}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
index b809460d7d..a0fb3eda35 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4_tunnels.rst
@@ -12,7 +12,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip4_tunnels-3n-icx-xxv710
-    ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-alt-xl710
     ip4_tunnels-3n-tsh-x520
 
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst
deleted file mode 100644
index 5092fae388..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,318 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale200k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6scale2m-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-af-xdp-ethip6-ip6scale20k-rnd}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-dot1q-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-dot1q-ip6base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-dot1q-ip6base}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-dot1q-ip6base}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k-rnd" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k-rnd.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k-rnd}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6scale20k-rnd}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-3n-skx-xxv710.rst
deleted file mode 100644
index 6a1640ab9c..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ip6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,74 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-avf
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6-ip6base}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-dpdk
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-78b-2t1c-ethip6-ip6base" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-ethip6-ip6base}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6.rst b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
index 02ba678ef9..cedd6ac76c 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
@@ -13,8 +13,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip6-2n-icx-xxv710
     ip6-3n-icx-xxv710
-    ip6-2n-skx-xxv710
-    ip6-3n-skx-xxv710
     ip6-2n-clx-xxv710
     ip6-2n-clx-cx556a
     ip6-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-skx-xxv710.rst
deleted file mode 100644
index 2b70a0cf24..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,235 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-1518b-2t1c-ipsec-ip4routing-base-scale-sw-avf
----------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-ip4routing-base-scale-sw-dpdk
-----------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
index 2deb4ff43f..0efe1cb4b4 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
@@ -12,6 +12,5 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-icx-xxv710
-    ipsec-3n-skx-xxv710
     ipsec-3n-alt-xl710
     ipsec-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst
deleted file mode 100644
index b9d37df0c3..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/l2-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,274 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-scale-avf
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale10kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale10kmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale100kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale100kmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale1mmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale1mmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdscale1mmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-scale-dpdk
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale10kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale10kmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale10kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale10kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale100kmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale100kmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale100kmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale100kmaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale1mmaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale1mmaclrn.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale1mmaclrn}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdscale1mmaclrn}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst
deleted file mode 100644
index aa98a17aa4..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/l2-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,174 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-avf
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-dot1q-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-dot1q-l2bdbasemaclrn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-dot1q-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-dot1q-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-dpdk
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-eth-l2patch" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2patch}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-eth-l2xcbase" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/l2.rst b/docs/report/vpp_performance_tests/packet_latency/l2.rst
index ce7d2a965c..bdb652b59c 100644
--- a/docs/report/vpp_performance_tests/packet_latency/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/l2.rst
@@ -13,8 +13,6 @@ CSIT source code for the test cases used for plots can be found in
 
     l2-2n-icx-xxv710
     l2-3n-icx-xxv710
-    l2-2n-skx-xxv710
-    l2-3n-skx-xxv710
     l2-2n-clx-xxv710
     l2-2n-clx-cx556a
     l2-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/nat44-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/nat44-2n-skx-xxv710.rst
deleted file mode 100644
index 141d3e9a00..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/nat44-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,442 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ethip4udp-nat44det-avf
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-64b-2t1c-ethip4udp-nat44ed-avf
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-2t1c-ethip4tcp-nat44ed-tput-avf
-    -----------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-2t1c-ethip4tcp-nat44ed-tput-avf
-    -----------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput}
-                \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/nat44.rst b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
index 4b6b47a2b6..55dd066fb7 100644
--- a/docs/report/vpp_performance_tests/packet_latency/nat44.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
@@ -12,6 +12,5 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     nat44-2n-icx-xxv710
-    nat44-2n-skx-xxv710
     nat44-2n-clx-xxv710
     nat44-2n-zn2-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_latency/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/srv6-3n-skx-xxv710.rst
deleted file mode 100644
index 22c10513a7..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/srv6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,152 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-srv6-ip6routing-base-dpdk
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids}
-            \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat.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]{hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat}
-                \label{fig:hdrh-lat-percentile-3n-skx-25ge2p1xxv710-78b-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/srv6.rst b/docs/report/vpp_performance_tests/packet_latency/srv6.rst
index a614847238..265462e68a 100644
--- a/docs/report/vpp_performance_tests/packet_latency/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/srv6.rst
@@ -12,5 +12,4 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-icx-xxv710
-    srv6-3n-skx-xxv710
     srv6-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-skx-xxv710.rst
deleted file mode 100644
index acc73ac1d1..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/vm_vhost-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-vhost-base-avf-testpmd
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-vhost-base-dpdk-testpmd
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-vhost-base-avf-vpp
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-vhost-base-dpdk-vpp
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc.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]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
index c55b8224ad..33d2d73eda 100644
--- a/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/vm_vhost.rst
@@ -14,7 +14,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vm_vhost-2n-icx-xxv710
-    vm_vhost-2n-skx-xxv710
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
     vm_vhost-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst
deleted file mode 100644
index 8c944201f9..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-memif-base-avf
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-memif-base-dpdk
-------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-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-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-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-skx-xxv710-64b-2t1c-memif-base-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-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-dpdk-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 d4e6d37962..1a48b0843c 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
@@ -18,7 +18,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     container_memif-2n-icx-xxv710
-    container_memif-2n-skx-xxv710
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index 6371e010c9..7a7464e51c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -42,8 +42,6 @@ Graphs are split into sections as follows:
      - 2n-icx: 2-node Xeon Icelake
      - 3n-icx: 3-node Xeon Icelake
      - 2n-aws: 2-node AWS
-     - 2n-skx: 2-node Xeon Skylake
-     - 3n-skx: 3-node Xeon Skylake
      - 2n-clx: 2-node Xeon Cascade Lake
      - 2n-zn2: 2-node AMD Zen2
      - 3n-alt: 2-node Arm Altra
@@ -139,8 +137,6 @@ Additional information about graph data:
     `build logs from FD.io vpp performance job 2n-icx`_,
     `build logs from FD.io vpp performance job 3n-icx`_,
     `build logs from FD.io vpp performance job 2n-aws`_,
-    `build logs from FD.io vpp performance job 2n-skx`_,
-    `build logs from FD.io vpp performance job 3n-skx`_,
     `build logs from FD.io vpp performance job 2n-clx`_,
     `build logs from FD.io vpp performance job 2n-zn2`_,
     `build logs from FD.io vpp performance job 3n-alt`_,
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
deleted file mode 100644
index 32989a236f..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-scale-[avf,dpdk]
------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]-ndr}
-            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,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-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk,af_xdp]-pdr}
-            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
deleted file mode 100644
index bd6b7cb76f..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-scale-avf
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
-    \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-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-ip4routing-base-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst
deleted file mode 100644
index d64333f604..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-avf
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-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]{3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-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]{3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
deleted file mode 100644
index 6ee0f19416..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4routing-base-[avf,dpdk]
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-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-skx-xxv710-64b-2t1c-ip4routing-base-pdr}
-            \label{fig:3n-skx-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 e974562b88..280d8c3a53 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -19,10 +19,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip4-2n-icx-xxv710
     ip4-3n-icx-xxv710
-    ip4-2n-skx-xxv710
-    ip4-2n-skx-x710
-    ip4-3n-skx-xxv710
-    ip4-3n-skx-x710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-skx-xxv710.rst
deleted file mode 100644
index e85274a0e1..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ethip4--ethip4udpgeneve-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
deleted file mode 100644
index 30daa158b7..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ip4tunnel-base
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-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-skx-xxv710-64b-2t1c-ip4tunnel-base-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-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/3n-skx-xxv710-64b-2t1c-ip4tunnel-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-skx-xxv710-64b-2t1c-ip4tunnel-base-pdr}
-            \label{fig:3n-skx-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 4083699f86..02ad900966 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
@@ -20,10 +20,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-2n-icx-xxv710
     ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-3n-icx-e810xxv
-    ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
     ip4_tunnels-2n-zn2-xxv710
-    ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-alt-xl710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
deleted file mode 100644
index e3ba92c274..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-scale-[avf,dpdk]
------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-ndr}
-            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-pdr}
-            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk,af_xdp]-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
deleted file mode 100644
index 1d759eb151..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,157 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-af-xdp
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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-skx-xxv710-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst
deleted file mode 100644
index 4329c4d4e0..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-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/3n-skx-x710-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]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-ndr}
-            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-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]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-pdr}
-            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst
deleted file mode 100644
index 721bdbebe3..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-ip6routing-base-[avf,dpdk]
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-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-skx-xxv710-78b-2t1c-ip6routing-base-ndr}
-            \label{fig:3n-skx-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-skx-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-skx-xxv710-78b-2t1c-ip6routing-base-pdr}
-            \label{fig:3n-skx-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 12e1761355..57884a3206 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -19,10 +19,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip6-2n-icx-xxv710
     ip6-3n-icx-xxv710
-    ip6-2n-skx-xxv710
-    ip6-2n-skx-x710
-    ip6-3n-skx-xxv710
-    ip6-3n-skx-x710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
deleted file mode 100644
index 9411a41857..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-imix-2t1c-ipsec-ip4routing-base-scale-avf
------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-ip4routing-base-scale-avf
-------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
-            \label{fig:3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-            \label{fig:3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-2t1c-ipsec-ip4routing-base-scale-dpdk
-------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk
--------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
-            \label{fig:3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-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]{3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
-            \label{fig:3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-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 31998d85b5..4f869895a1 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,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-icx-xxv710
-    ipsec-3n-skx-xxv710
     ipsec-3n-alt-xl710
     ipsec-3n-tsh-x520
     ipsec-2n-tx2-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
deleted file mode 100644
index 1ab275be1b..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-scale-[avf,dpdk]
-------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,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-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
-            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,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-skx-x710-64b-2t1c-l2switching-base-scale-[avf,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-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
-            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
deleted file mode 100644
index ad4bda2108..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-avf
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-dpdk
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-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-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
-    \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-skx-xxv710-64b-2t1c-l2switching-base-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-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-scale-avf
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-l2switching-base-scale-dpdk
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-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-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-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-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst
deleted file mode 100644
index 9fe20c6d9f..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-l2switching-base-avf
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
deleted file mode 100644
index 42f61ec2c1..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-l2switching-base
--------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-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-skx-xxv710-64b-2t1c-l2switching-base-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-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-skx-xxv710-64b-2t1c-l2switching-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-skx-xxv710-64b-2t1c-l2switching-base-pdr}
-            \label{fig:3n-skx-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 63304ad908..01c885cb0b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -19,10 +19,6 @@ CSIT source code for the test cases used for plots can be found in
 
     l2-2n-icx-xxv710
     l2-3n-icx-xxv710
-    l2-2n-skx-xxv710
-    l2-2n-skx-x710
-    l2-3n-skx-xxv710
-    l2-3n-skx-x710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
     l2-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-skx.rst
deleted file mode 100644
index 48e88f4040..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-            \label{fig:2n-skx-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 b72db3e532..29f1678a96 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,4 +10,3 @@ Det BiDir
 
     nat44-det-bidir-2n-icx
     nat44-det-bidir-2n-clx
-    nat44-det-bidir-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-skx.rst
deleted file mode 100644
index 9704af80e8..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-skx-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 d861bcdd49..0fa02ace89 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,4 +10,3 @@ ED TCP CPS
 
     nat44-ed-tcp-cps-2n-icx
     nat44-ed-tcp-cps-2n-clx
-    nat44-ed-tcp-cps-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-skx.rst
deleted file mode 100644
index dde450a6e7..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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-skx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-            \label{fig:2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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-skx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-            \label{fig:2n-skx-xxv710-100b-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 27c77bf812..27a114e9d7 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,4 +10,3 @@ ED TCP TPUT
 
     nat44-ed-tcp-tput-2n-icx
     nat44-ed-tcp-tput-2n-clx
-    nat44-ed-tcp-tput-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-skx.rst
deleted file mode 100644
index d7cf06e09e..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-skx-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 c3a36d714f..0995fbf4bb 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,4 +10,3 @@ ED UDP CPS
 
     nat44-ed-udp-cps-2n-icx
     nat44-ed-udp-cps-2n-clx
-    nat44-ed-udp-cps-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-skx.rst
deleted file mode 100644
index 0c32ac9833..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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-skx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-            \label{fig:2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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-skx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-            \label{fig:2n-skx-xxv710-100b-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 e5979d8d75..383558b8be 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,4 +10,3 @@ ED UDP TPUT
 
     nat44-ed-udp-tput-2n-icx
     nat44-ed-udp-tput-2n-clx
-    nat44-ed-udp-tput-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-skx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-skx.rst
deleted file mode 100644
index 644e47470a..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-            \label{fig:2n-skx-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 d7e4be4317..6fc9d4f4a2 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,4 +10,3 @@ ED UniDir
 
     nat44-ed-unidir-2n-icx
     nat44-ed-unidir-2n-clx
-    nat44-ed-unidir-2n-skx
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
deleted file mode 100644
index 8c6783571c..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,111 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-srv6-ip6routing-base-avf
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr}
-    \end{figure}
-
-..
-    78b-2t1c-srv6-ip6routing-base-dpdk
-    ----------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-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-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-ndr}
-                \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-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/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-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-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-pdr}
-                \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-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 a9676613c0..5a721f1c48 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,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-icx-xxv710
-    srv6-3n-skx-xxv710
     srv6-3n-tsh-x520
 
 ..
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
deleted file mode 100644
index b339690afd..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,115 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-
-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-skx-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-skx-xxv710-64b-2t1c-vhost-base-ndr}
-            \label{fig:2n-skx-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-skx-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-skx-xxv710-64b-2t1c-vhost-base-pdr}
-            \label{fig:2n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-64b-2t1c-vhost-base-vpp-ndr}
-            \label{fig:2n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-64b-2t1c-vhost-base-vpp-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-vpp-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 b9b039727c..755d519f14 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
@@ -21,7 +21,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vm_vhost-2n-icx-xxv710
-    vm_vhost-2n-skx-xxv710
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
     vm_vhost-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/reconf_tests/index.rst b/docs/report/vpp_performance_tests/reconf_tests/index.rst
index 9a3e3e5166..c5da438b29 100644
--- a/docs/report/vpp_performance_tests/reconf_tests/index.rst
+++ b/docs/report/vpp_performance_tests/reconf_tests/index.rst
@@ -13,6 +13,3 @@ See :ref:`reconf_tests` for methodology description of this test type.
 .. toctree::
 
     vnf_service_chains_reconf
-
-..
-    ipsec_reconf
diff --git a/docs/report/vpp_performance_tests/reconf_tests/ipsec_reconf.rst b/docs/report/vpp_performance_tests/reconf_tests/ipsec_reconf.rst
deleted file mode 100644
index c09c7d5eaa..0000000000
--- a/docs/report/vpp_performance_tests/reconf_tests/ipsec_reconf.rst
+++ /dev/null
@@ -1,272 +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>
-
-.. _ipsec_reconf:
-
-Internet Protocol Security
-==========================
-
-Additional information about graph data:
-
-#. **Graph Title**: describes tested VPP packet path.
-
-#. **X-axis Labels**: indices of individual test suites as listed in
-   Graph Legend.
-
-#. **Y-axis Labels**: measured Effective Blocked Time [s] values.
-
-#. **Graph Legend**: lists X-axis indices with associated CSIT test
-   suites executed to generate graphed test results and the average value
-   of packet loss (measured in packets).
-
-#. **Hover Information**: lists minimum, first quartile, median,
-   third quartile, and maximum. If either type of outlier is present the
-   whisker on the appropriate side is taken to 1.5×IQR from the quartile
-   (the "inner fence") rather than the max or min, and individual outlying
-   data points are displayed as unfilled circles (for suspected outliers)
-   or filled circles (for outliers). (The "outer fence" is 3×IQR from the
-   quartile.)
-
-.. note::
-
-    Test results are stored in
-    `FD.io test executor vpp performance job 3n-hsw`_ with RF
-    result files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-.. raw:: latex
-
-    \clearpage
-
-3n-hsw-xl710
-~~~~~~~~~~~~
-
-64b-ethip4ipsec4tnlsw
----------------------
-
-1t1c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="001" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2t2c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="002" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-4t4c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="003" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-ethip4ipsec1000tnlsw
-------------------------
-
-1t1c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2t2c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-4t4c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="103" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-ethip4ipsec60000tnlsw
--------------------------
-
-1t1c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2t2c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-4t4c
-::::
-
-.. raw:: html
-
-    <center>
-    <iframe id="203" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-            \label{fig:3n-hsw-xl710-64b-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/reconf_tests/vnf_service_chains_reconf.rst b/docs/report/vpp_performance_tests/reconf_tests/vnf_service_chains_reconf.rst
index fee0dceca2..a03deb693a 100644
--- a/docs/report/vpp_performance_tests/reconf_tests/vnf_service_chains_reconf.rst
+++ b/docs/report/vpp_performance_tests/reconf_tests/vnf_service_chains_reconf.rst
@@ -73,7 +73,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_,
     `build logs from FD.io vpp performance job 2n-clx`_ with RF
     result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -151,75 +150,6 @@ imix-8t4c-dot1qip4vxlan-l2bd
 
     \clearpage
 
-2n-skx-xxv710
-~~~~~~~~~~~~~
-
-imix-2t1c-dot1qip4vxlan-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-reconf}
-            \label{fig:2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-4t2c-dot1qip4vxlan-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-reconf}
-            \label{fig:2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-8t4c-dot1qip4vxlan-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-reconf.html"></iframe>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-reconf}
-            \label{fig:2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-reconf}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
diff --git a/docs/report/vpp_performance_tests/soak_tests/index.rst b/docs/report/vpp_performance_tests/soak_tests/index.rst
index 36255e78ad..8943b037eb 100644
--- a/docs/report/vpp_performance_tests/soak_tests/index.rst
+++ b/docs/report/vpp_performance_tests/soak_tests/index.rst
@@ -55,7 +55,6 @@ Additional information about graph data:
 
     Test results are stored in
     `build logs from FD.io vpp performance job 2n-icx`_,
-    `build logs from FD.io vpp performance job 2n-skx`_ and
     `build logs from FD.io vpp performance job 2n-clx`_ with RF
     result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
@@ -145,46 +144,3 @@ Additional information about graph data:
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{soak-test-2}
             \label{fig:soak-test-2}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-2n-skx
-------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/soak-test-2n-skx-1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{soak-test-2n-skx-1}
-            \label{fig:soak-test-2n-skx-1}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/soak-test-2n-skx-2.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{soak-test-2n-skx-2}
-            \label{fig:soak-test-2n-skx-2}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
deleted file mode 100644
index 476c97a213..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-memif-base-avf
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-memif-base-dpdk
--------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-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-skx-xxv710-64b-memif-base-dpdk-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-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-skx-xxv710-64b-memif-base-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-skx-xxv710-64b-memif-base-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-dpdk-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 5c91b2b9e8..a8b6c0c537 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
@@ -20,7 +20,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     container_memif-2n-icx-xxv710
-    container_memif-2n-skx-xxv710
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
index a15f89300d..89fc9b342f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
@@ -10,7 +10,7 @@ Speedup Multi-Core
 
 Speedup Multi-Core throughput graphs are generated by multiple
 executions of the same performance tests across physical testbeds hosted
-LF FD.io labs: 2n-icx, 3n-icx, 2n-aws, 2n-skx, 3n-skx, 2n-clx, 2n-zn2, 3n-alt,
+LF FD.io labs: 2n-icx, 3n-icx, 2n-aws, 2n-clx, 2n-zn2, 3n-alt,
 3n-tsh, 2n-tx2, 2n-dnv, 3n-dnv.
 Grouped bars illustrate the 64B/78B packet throughput speedup ratio for
 2- and 4-core multi-threaded VPP configurations relative to 1-core
@@ -41,8 +41,6 @@ Additional information about graph data:
     `build logs from FD.io vpp performance job 2n-icx`_,
     `build logs from FD.io vpp performance job 3n-icx`_,
     `build logs from FD.io vpp performance job 2n-aws`_,
-    `build logs from FD.io vpp performance job 2n-skx`_,
-    `build logs from FD.io vpp performance job 3n-skx`_,
     `build logs from FD.io vpp performance job 2n-clx`_,
     `build logs from FD.io vpp performance job 2n-zn2`_,
     `build logs from FD.io vpp performance job 3n-alt`_,
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
deleted file mode 100644
index dacbf3250a..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-ip4routing-base-scale-[avf,dpdk]
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,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-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-ndr-tsa}
-            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,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-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-pdr-tsa}
-            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
deleted file mode 100644
index 6b562b78d0..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-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-skx-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-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:2n-skx-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-skx-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-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-ip4routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-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-skx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-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-skx-xxv710-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-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-skx-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-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-skx-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-skx-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-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-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-skx-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-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa}
-            \label{fig:2n-skx-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-skx-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-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst
deleted file mode 100644
index bba426bc86..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-ip4routing-base-avf
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-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]{3n-skx-x710-64b-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-skx-x710-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/3n-skx-x710-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]{3n-skx-x710-64b-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
deleted file mode 100644
index e257b54121..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-ip4routing-base-[avf,dpdk]
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-ip4routing-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]{3n-skx-xxv710-64b-ip4routing-base-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4routing-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/vpp/3n-skx-xxv710-64b-ip4routing-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]{3n-skx-xxv710-64b-ip4routing-base-pdr-tsa}
-            \label{fig:3n-skx-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 2c6cd23467..f870c724ec 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
@@ -21,10 +21,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip4-2n-icx-xxv710
     ip4-3n-icx-xxv710
-    ip4-2n-skx-xxv710
-    ip4-2n-skx-x710
-    ip4-3n-skx-xxv710
-    ip4-3n-skx-x710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-skx-xxv710.rst
deleted file mode 100644
index 7f01abf75e..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-ethip4--ethip4udpgeneve-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-ethip4--ethip4udpgeneve-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-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
deleted file mode 100644
index 060a1107b2..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-ip4tunnel-base
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-ip4tunnel-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]{3n-skx-xxv710-64b-ip4tunnel-base-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4tunnel-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/3n-skx-xxv710-64b-ip4tunnel-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]{3n-skx-xxv710-64b-ip4tunnel-base-pdr-tsa}
-            \label{fig:3n-skx-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 c066950070..470c2e3c96 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
@@ -22,10 +22,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-2n-icx-xxv710
     ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-3n-icx-e810xxv
-    ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
     ip4_tunnels-2n-zn2-xxv710
-    ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-alt-xl710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
deleted file mode 100644
index 214a27218a..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-78b-ip6routing-base-scale-[avf,dpdk]
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,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-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-ndr-tsa}
-            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-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-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,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-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-pdr-tsa}
-            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
deleted file mode 100644
index b71359354f..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,157 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-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-skx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-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-skx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-base-scale-af-xdp
---------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-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-skx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02af" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-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-skx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-base-scale-dpdk
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-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-skx-xxv710-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-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst
deleted file mode 100644
index d4f9ceee77..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-78b-ip6routing-base-scale-avf
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-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]{3n-skx-x710-78b-ip6routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-skx-x710-78b-ip6routing-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/3n-skx-x710-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]{3n-skx-x710-78b-ip6routing-base-scale-avf-pdr-tsa}
-            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst
deleted file mode 100644
index 6310a31fdd..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-ip6routing-base-[avf,dpdk]
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-ip6routing-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]{3n-skx-xxv710-78b-ip6routing-base-ndr-tsa}
-            \label{fig:3n-skx-xxv710-78b-ip6routing-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/vpp/3n-skx-xxv710-78b-ip6routing-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]{3n-skx-xxv710-78b-ip6routing-base-pdr-tsa}
-            \label{fig:3n-skx-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 261d07367a..77333cdb43 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
@@ -21,10 +21,6 @@ CSIT source code for the test cases used for plots can be found in
 
     ip6-2n-icx-xxv710
     ip6-3n-icx-xxv710
-    ip6-2n-skx-xxv710
-    ip6-2n-skx-x710
-    ip6-3n-skx-xxv710
-    ip6-3n-skx-x710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
deleted file mode 100644
index ffe44edfb5..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,157 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-imix-ipsec-ip4routing-base-scale-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-ipsec-ip4routing-base-scale-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa}
-            \label{fig:3n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-            \label{fig:3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-ipsec-ip4routing-base-scale-dpdk
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:3n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
-            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-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 8f1102faff..184e04ab55 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,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-icx-xxv710
-    ipsec-3n-skx-xxv710
     ipsec-3n-alt-xl710
     ipsec-3n-tsh-x520
     ipsec-2n-tx2-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
deleted file mode 100644
index f023b0f884..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-l2switching-base-scale-[avf,dpdk]
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-[avf,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-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
-            \label{fig:2n-skx-x710-64b-l2switching-base-scale-[avf,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-skx-x710-64b-l2switching-base-scale-[avf,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-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
-            \label{fig:2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
deleted file mode 100644
index f59966dc44..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,200 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-l2switching-base-avf
-------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-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-skx-xxv710-64b-l2switching-base-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-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-skx-xxv710-64b-l2switching-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-skx-xxv710-64b-l2switching-base-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-l2switching-base-dpdk
--------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-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-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-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-skx-xxv710-64b-l2switching-base-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-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-l2switching-base-scale-avf
-------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-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-skx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-l2switching-base-scale-dpdk
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-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-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-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-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst
deleted file mode 100644
index 6d4a0b8998..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst
+++ /dev/null
@@ -1,71 +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-skx-x710
-~~~~~~~~~~~
-
-64b-l2switching-base-avf
-------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-ndr-tsa}
-            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
deleted file mode 100644
index 58ea656ac6..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-l2switching-base
---------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-l2switching-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]{3n-skx-xxv710-64b-l2switching-base-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-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/vpp/3n-skx-xxv710-64b-l2switching-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]{3n-skx-xxv710-64b-l2switching-base-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-base-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 5133b54561..57627d3b58 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
@@ -21,10 +21,6 @@ CSIT source code for the test cases used for plots can be found in
 
     l2-2n-icx-xxv710
     l2-3n-icx-xxv710
-    l2-2n-skx-xxv710
-    l2-2n-skx-x710
-    l2-3n-skx-xxv710
-    l2-3n-skx-x710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
     l2-2n-clx-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-skx.rst
deleted file mode 100644
index e3f5050e20..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-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-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-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-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-            \label{fig:2n-skx-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 b72db3e532..29f1678a96 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,4 +10,3 @@ Det BiDir
 
     nat44-det-bidir-2n-icx
     nat44-det-bidir-2n-clx
-    nat44-det-bidir-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-skx.rst
deleted file mode 100644
index f824b3bd21..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-skx-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 d861bcdd49..0fa02ace89 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,4 +10,3 @@ ED TCP CPS
 
     nat44-ed-tcp-cps-2n-icx
     nat44-ed-tcp-cps-2n-clx
-    nat44-ed-tcp-cps-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-skx.rst
deleted file mode 100644
index 1d312a8ef1..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-100b-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 27c77bf812..27a114e9d7 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,4 +10,3 @@ ED TCP TPUT
 
     nat44-ed-tcp-tput-2n-icx
     nat44-ed-tcp-tput-2n-clx
-    nat44-ed-tcp-tput-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-skx.rst
deleted file mode 100644
index af6e74ba40..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-skx-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 c3a36d714f..0995fbf4bb 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,4 +10,3 @@ ED UDP CPS
 
     nat44-ed-udp-cps-2n-icx
     nat44-ed-udp-cps-2n-clx
-    nat44-ed-udp-cps-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-skx.rst
deleted file mode 100644
index 76984b768f..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-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-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-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-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-100b-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 e5979d8d75..383558b8be 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,4 +10,3 @@ ED UDP TPUT
 
     nat44-ed-udp-tput-2n-icx
     nat44-ed-udp-tput-2n-clx
-    nat44-ed-udp-tput-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-skx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-skx.rst
deleted file mode 100644
index d42cf8fb77..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-skx.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-            \label{fig:2n-skx-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 d7e4be4317..6fc9d4f4a2 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,4 +10,3 @@ ED UniDir
 
     nat44-ed-unidir-2n-icx
     nat44-ed-unidir-2n-clx
-    nat44-ed-unidir-2n-skx
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
deleted file mode 100644
index d5a0753dbe..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
+++ /dev/null
@@ -1,71 +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-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-srv6-ip6routing-base-avf
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-srv6-ip6routing-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]{3n-skx-xxv710-78b-srv6-ip6routing-base-avf-ndr-tsa}
-            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-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/3n-skx-xxv710-78b-srv6-ip6routing-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]{3n-skx-xxv710-78b-srv6-ip6routing-base-avf-pdr-tsa}
-            \label{fig:3n-skx-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 101ee28880..f08270fa69 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,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-icx-xxv710
-    srv6-3n-skx-xxv710
     srv6-3n-tsh-x520
 
 ..
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
deleted file mode 100644
index 0c13ed945d..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.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-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-vhost-base-testpmd
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-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-skx-xxv710-64b-vhost-base-ndr-tsa}
-            \label{fig:2n-skx-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-skx-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-skx-xxv710-64b-vhost-base-pdr-tsa}
-            \label{fig:2n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-64b-vhost-base-vpp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-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-skx-xxv710-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-skx-xxv710-64b-vhost-base-vpp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-vhost-base-vpp-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 cc16195a12..f3c377a5f9 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
@@ -20,7 +20,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vm_vhost-2n-icx-xxv710
-    vm_vhost-2n-skx-xxv710
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
     vm_vhost-2n-clx-e810cq
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 5c71340f8d..00e518d783 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -10,469 +10,54 @@
 
 ################################################################################
 
-  # 3n-skx
-
-  vpp-3n-skx-hist-iter-new-env:
-    csit-vpp-perf-report-iterative-2202-3n-skx:
-      - 6   # rls2110.rel NDRPDR iter env 9
-      - 7   # rls2110.rel NDRPDR iter env 9
-      - 8   # rls2110.rel NDRPDR iter env 9
-      - 9   # rls2110.rel NDRPDR iter env 9
-      - 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
-      - 14  # rls2110.rel NDRPDR iter env 9
-      - 15  # rls2110.rel NDRPDR iter env 9
-
-  vpp-3n-skx-prev-iter-old-env:
-    csit-vpp-perf-report-iterative-2202-3n-skx:
-      - 28  # rls2202.rel NDRPDR iter env 9
-      - 37  # rls2202.rel NDRPDR iter env 9
-      - 38  # rls2202.rel NDRPDR iter env 9
-      - 39  # rls2202.rel NDRPDR iter env 9
-      - 40  # rls2202.rel NDRPDR iter env 9
-      - 42  # rls2202.rel NDRPDR iter env 9
-      - 43  # rls2202.rel NDRPDR iter env 9
-      - 44  # rls2202.rel NDRPDR iter env 9
-      - 45  # rls2202.rel NDRPDR iter env 9
-      - 48  # rls2202.rel NDRPDR iter env 9
-
-  vpp-3n-skx-prev-iter-new-env:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 5   # rls2202.rel NDRPDR iter env 10
-      - 6   # rls2202.rel NDRPDR iter env 10
-      - 7   # rls2202.rel NDRPDR iter env 10
-      - 8   # rls2202.rel NDRPDR iter env 10
-      - 9   # rls2202.rel NDRPDR iter env 10
-      - 10  # rls2202.rel NDRPDR iter env 10
-      - 11  # rls2202.rel NDRPDR iter env 10
-      - 12  # rls2202.rel NDRPDR iter env 10
-      - 13  # rls2202.rel NDRPDR iter env 10
-      - 14  # rls2202.rel NDRPDR iter env 10
-
-  vpp-3n-skx-curr-iter:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 49  # rls2206.rel NDRPDR iter env 10
-      - 55  # rls2206.rel NDRPDR iter env 10
-      - 56  # rls2206.rel NDRPDR iter env 10
-      - 57  # rls2206.rel NDRPDR iter env 10
-      - 58  # rls2206.rel NDRPDR iter env 10
-      - 59  # rls2206.rel NDRPDR iter env 10
-      - 61  # rls2206.rel NDRPDR iter env 10
-      - 62  # rls2206.rel NDRPDR iter env 10
-      - 64  # rls2206.rel NDRPDR iter env 10
-      - 65  # rls2206.rel NDRPDR iter env 10
-
-  vpp-3n-skx-curr-iter-best:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 49  # rls2206.rel NDRPDR iter env 10
-
-  vpp-3n-skx-hist-iter-mrr-new-env:
-    csit-vpp-perf-report-iterative-2202-3n-skx:
-      - 4   # rls2110.rel MRR iter env 9
-
-  vpp-3n-skx-prev-iter-mrr-old-env:
-    csit-vpp-perf-report-iterative-2202-3n-skx:
-      - 27  # rls2202.rel MRR iter env 9
-
-  vpp-3n-skx-prev-iter-mrr-new-env:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 4   # rls2202.rel MRR iter env 10
-
-  vpp-3n-skx-curr-iter-mrr:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 32  # rls2206.rel MRR iter env 10
-
-  vpp-3n-skx-hist-iter-hoststack-new-env:
-    csit-vpp-perf-report-iterative-2110-3n-skx:
-      - 40  # rls2110.rel NDRPDR iter env 8
-      - 41  # rls2110.rel NDRPDR iter env 8
-      - 42  # rls2110.rel NDRPDR iter env 8
-      - 43  # rls2110.rel NDRPDR iter env 8
-      - 44  # rls2110.rel NDRPDR iter env 8
-      - 45  # rls2110.rel NDRPDR iter env 8
-      - 46  # rls2110.rel NDRPDR iter env 8
-      - 47  # rls2110.rel NDRPDR iter env 8
-      - 48  # rls2110.rel NDRPDR iter env 8
-      - 49  # rls2110.rel NDRPDR iter env 8
-
-  vpp-3n-skx-prev-iter-hoststack-old-env:
-    csit-vpp-perf-report-iterative-2202-3n-skx:
-      - 29  # rls2202.rel hoststack iter env 9
-      - 30  # rls2202.rel hoststack iter env 9
-      - 31  # rls2202.rel hoststack iter env 9
-      - 32  # rls2202.rel hoststack iter env 9
-      - 34  # rls2202.rel hoststack iter env 9
-      - 35  # rls2202.rel hoststack iter env 9
-      - 36  # rls2202.rel hoststack iter env 9
-      - 41  # rls2202.rel hoststack iter env 9
-      - 46  # rls2202.rel hoststack iter env 9
-      - 47  # rls2202.rel hoststack iter env 9
-
-  vpp-3n-skx-curr-iter-hoststack:
-    csit-vpp-perf-report-iterative-2206-3n-skx:
-      - 47  # rls2206.rel hoststack iter env 10
-      - 54  # rls2206.rel hoststack iter env 10
-      - 60  # rls2206.rel hoststack iter env 10
-      - 63  # rls2206.rel hoststack iter env 10
-      - 66  # rls2206.rel hoststack iter env 10
-      - 67  # rls2206.rel hoststack iter env 10
-      - 68  # rls2206.rel hoststack iter env 10
-      - 69  # rls2206.rel hoststack iter env 10
-      - 70  # rls2206.rel hoststack iter env 10
-      - 71  # rls2206.rel hoststack iter env 10
-
-  vpp-3n-skx-curr-cov:
-    csit-vpp-perf-report-coverage-2206-3n-skx:
-      - 1   # rls2206.rel NDRPDR cov env 10
-      - 2   # rls2206.rel NDRPDR cov env 10
-      - 3   # rls2206.rel NDRPDR cov env 10
-      - 4   # rls2206.rel NDRPDR cov env 10
-      - 5   # rls2206.rel NDRPDR cov env 10
-      - 6   # rls2206.rel NDRPDR cov env 10
-      - 7   # rls2206.rel NDRPDR cov env 10
-      - 8   # rls2206.rel NDRPDR cov env 10
-      - 9   # rls2206.rel NDRPDR cov env 10
-      - 10  # rls2206.rel NDRPDR cov env 10
-      - 11  # rls2206.rel NDRPDR cov env 10
-      - 12  # rls2206.rel NDRPDR cov env 10
-      - 13  # rls2206.rel NDRPDR cov env 10
-      - 14  # rls2206.rel NDRPDR cov env 10
-      - 15  # rls2206.rel NDRPDR cov env 10
-      - 16  # rls2206.rel NDRPDR cov env 10
-      - 17  # rls2206.rel NDRPDR cov env 10
-      - 18  # rls2206.rel NDRPDR cov env 10
-      - 19  # rls2206.rel NDRPDR cov env 10
-      - 20  # rls2206.rel NDRPDR cov env 10
-      - 21  # rls2206.rel NDRPDR cov env 10
-      - 22  # rls2206.rel NDRPDR cov env 10
-      - 23  # rls2206.rel NDRPDR cov env 10
-      - 24  # rls2206.rel NDRPDR cov env 10
-      - 25  # rls2206.rel NDRPDR cov env 10
-      - 26  # rls2206.rel NDRPDR cov env 10
-      - 27  # rls2206.rel NDRPDR cov env 10
-      - 28  # rls2206.rel NDRPDR cov env 10
-      - 29  # rls2206.rel NDRPDR cov env 10
-      - 30  # rls2206.rel NDRPDR cov env 10
-      - 31  # rls2206.rel NDRPDR cov env 10
-      - 32  # rls2206.rel NDRPDR cov env 10
-      - 33  # rls2206.rel NDRPDR cov env 10
-      - 34  # rls2206.rel NDRPDR cov env 10
-
-  dpdk-3n-skx-hist-iter:
-    csit-dpdk-perf-report-iterative-2110-3n-skx:
-      - 7   # rls2110 NDRPDR iter env 8
-      - 8   # rls2110 NDRPDR iter env 8
-      - 10  # rls2110 NDRPDR iter env 8
-      - 15  # rls2110 NDRPDR iter env 8
-      - 16  # rls2110 NDRPDR iter env 8
-      - 17  # rls2110 NDRPDR iter env 8
-      - 18  # rls2110 NDRPDR iter env 8
-      - 19  # rls2110 NDRPDR iter env 8
-      - 20  # rls2110 NDRPDR iter env 8
-      - 21  # rls2110 NDRPDR iter env 8
-
-  dpdk-3n-skx-prev-iter:
-    csit-dpdk-perf-report-iterative-2202-3n-skx:
-      - 12  # rls2202 NDRPDR iter env 9
-      - 13  # rls2202 NDRPDR iter env 9
-      - 14  # rls2202 NDRPDR iter env 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
-      - 19  # rls2202 NDRPDR iter env 9
-      - 20  # rls2202 NDRPDR iter env 9
-      - 21  # rls2202 NDRPDR iter env 9
-
-  dpdk-3n-skx-curr-iter:
-    csit-dpdk-perf-report-iterative-2206-3n-skx:
-      - 1   # rls2206 NDRPDR iter env 10
-      - 2   # rls2206 NDRPDR iter env 10
-      - 3   # rls2206 NDRPDR iter env 10
-      - 4   # rls2206 NDRPDR iter env 10
-      - 5   # rls2206 NDRPDR iter env 10
-      - 6   # rls2206 NDRPDR iter env 10
-      - 7   # rls2206 NDRPDR iter env 10
-      - 8   # rls2206 NDRPDR iter env 10
-      - 9   # rls2206 NDRPDR iter env 10
-      - 10  # rls2206 NDRPDR iter env 10
-
-  dpdk-3n-skx-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2206-3n-skx:
-      - 1   # rls2206 NDRPDR iter env 10
-
-  # 2n-skx
-
-  vpp-2n-skx-hist-iter-new-env:
-    csit-vpp-perf-report-iterative-2202-2n-skx:
-      - 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
-      - 14  # rls2110.rel NDRPDR iter env 9
-      - 15  # 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
-      - 19  # rls2110.rel NDRPDR iter env 9
-
-  vpp-2n-skx-prev-iter-old-env:
-    csit-vpp-perf-report-iterative-2202-2n-skx:
-      - 41  # rls2202.rel NDRPDR iter env 9
-      - 48  # rls2202.rel NDRPDR iter env 9
-      - 49  # rls2202.rel NDRPDR iter env 9
-      - 50  # rls2202.rel NDRPDR iter env 9
-      - 51  # rls2202.rel NDRPDR iter env 9
-      - 56  # rls2202.rel NDRPDR iter env 9
-      - 63  # rls2202.rel NDRPDR iter env 9
-      - 64  # rls2202.rel NDRPDR iter env 9
-      - 68  # rls2202.rel NDRPDR iter env 9
-      - 69  # rls2202.rel NDRPDR iter env 9
-
-  vpp-2n-skx-prev-iter-new-env:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 10  # rls2202.rel NDRPDR iter env 10
-      - 11  # rls2202.rel NDRPDR iter env 10
-      - 12  # rls2202.rel NDRPDR iter env 10
-      - 13  # rls2202.rel NDRPDR iter env 10
-      - 14  # rls2202.rel NDRPDR iter env 10
-      - 15  # rls2202.rel NDRPDR iter env 10
-      - 16  # rls2202.rel NDRPDR iter env 10
-      - 17  # rls2202.rel NDRPDR iter env 10
-      - 18  # rls2202.rel NDRPDR iter env 10
-      - 19  # rls2202.rel NDRPDR iter env 10
-      - 100 # rls2202.rel NDRPDR iter env 10 NA44
-      - 101 # rls2202.rel NDRPDR iter env 10 NA44
-      - 102 # rls2202.rel NDRPDR iter env 10 NA44
-      - 103 # rls2202.rel NDRPDR iter env 10 NA44
-      - 104 # rls2202.rel NDRPDR iter env 10 NA44
-      - 105 # rls2202.rel NDRPDR iter env 10 NA44
-      - 106 # rls2202.rel NDRPDR iter env 10 NA44
-      - 107 # rls2202.rel NDRPDR iter env 10 NA44
-      - 108 # rls2202.rel NDRPDR iter env 10 NA44
-      - 109 # rls2202.rel NDRPDR iter env 10 NA44
-
-  vpp-2n-skx-curr-iter:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 59  # rls2206.rel NDRPDR iter env 10
-      - 60  # rls2206.rel NDRPDR iter env 10
-      - 61  # rls2206.rel NDRPDR iter env 10
-      - 62  # rls2206.rel NDRPDR iter env 10
-      - 63  # rls2206.rel NDRPDR iter env 10
-      - 71  # rls2206.rel NDRPDR iter env 10
-      - 72  # rls2206.rel NDRPDR iter env 10
-      - 77  # rls2206.rel NDRPDR iter env 10
-      - 79  # rls2206.rel NDRPDR iter env 10
-      - 80  # rls2206.rel NDRPDR iter env 10
-      - 89  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 90  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 91  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 92  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 93  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 94  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 95  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 96  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 97  # rls2206.rel NDRPDR iter env 10 NAT44
-      - 98  # rls2206.rel NDRPDR iter env 10 NAT44
-
-  vpp-2n-skx-curr-iter-best:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 59  # rls2206.rel NDRPDR iter env 10
-
-  vpp-2n-skx-hist-iter-mrr-new-env:
-    csit-vpp-perf-report-iterative-2202-2n-skx:
-      - 8   # rls2110.rel MRR iter env 9
-
-  vpp-2n-skx-prev-iter-mrr-old-env:
-    csit-vpp-perf-report-iterative-2202-2n-skx:
-      - 40  # rls2202.rel MRR iter env 9
-
-  vpp-2n-skx-prev-iter-mrr-new-env:
-    csit-vpp-perf-report-iterative-2202-2n-skx:
-      - 9   # rls2202.rel MRR iter env 10
-      - 99  # rls2202.rel MRR iter env 10 NAT44
-
-  vpp-2n-skx-curr-iter-mrr:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 49  # rls2206.rel MRR iter env 10
-      - 88  # rls2206.rel MRR iter env 10 NAT44
-
-  vpp-2n-skx-curr-soak:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 58  # rls2206.rel soak env 10
-      - 69  # rls2206.rel soak env 10
-  vpp-soak-vs-ndr-2n-skx-ref:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 59  # rls2206.rel NDRPDR iter env 10
-      - 60  # rls2206.rel NDRPDR iter env 10
-      - 61  # rls2206.rel NDRPDR iter env 10
-      - 62  # rls2206.rel NDRPDR iter env 10
-      - 63  # rls2206.rel NDRPDR iter env 10
-      - 71  # rls2206.rel NDRPDR iter env 10
-      - 72  # rls2206.rel NDRPDR iter env 10
-      - 77  # rls2206.rel NDRPDR iter env 10
-      - 79  # rls2206.rel NDRPDR iter env 10
-      - 80  # rls2206.rel NDRPDR iter env 10
-  vpp-soak-vs-ndr-2n-skx:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 59  # rls2206.rel NDRPDR iter env 10
-      - 60  # rls2206.rel NDRPDR iter env 10
-      - 61  # rls2206.rel NDRPDR iter env 10
-      - 62  # rls2206.rel NDRPDR iter env 10
-      - 63  # rls2206.rel NDRPDR iter env 10
-      - 71  # rls2206.rel NDRPDR iter env 10
-      - 72  # rls2206.rel NDRPDR iter env 10
-      - 77  # rls2206.rel NDRPDR iter env 10
-      - 79  # rls2206.rel NDRPDR iter env 10
-      - 80  # rls2206.rel NDRPDR iter env 10
-      - 58  # rls2206.rel soak env 10
-      - 69  # rls2206.rel soak env 10
-
-  vpp-2n-skx-curr-nfv-ndrpdr:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 56  # rls2206.rel NDRPDR nf-density iter env 10
-      - 64  # rls2206.rel NDRPDR nf-density iter env 10
-      - 65  # rls2206.rel NDRPDR nf-density iter env 10
-      - 67  # rls2206.rel NDRPDR nf-density iter env 10
-      - 70  # rls2206.rel NDRPDR nf-density iter env 10
-      - 73  # rls2206.rel NDRPDR nf-density iter env 10
-      - 75  # rls2206.rel NDRPDR nf-density iter env 10
-      - 78  # rls2206.rel NDRPDR nf-density iter env 10
-      - 81  # rls2206.rel NDRPDR nf-density iter env 10
-      - 82  # rls2206.rel NDRPDR nf-density iter env 10
-
-  vpp-2n-skx-curr-nfv-mrr:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 51  # rls2206.rel MRR nf-density iter env 10
-
-  vpp-2n-skx-curr-nfv-reconf:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 57  # rls2206.rel NDRPDR reconf iter env 10
-      - 66  # rls2206.rel NDRPDR reconf iter env 10
-      - 68  # rls2206.rel NDRPDR reconf iter env 10
-      - 74  # rls2206.rel NDRPDR reconf iter env 10
-      - 76  # rls2206.rel NDRPDR reconf iter env 10
-      - 83  # rls2206.rel NDRPDR reconf iter env 10
-      - 84  # rls2206.rel NDRPDR reconf iter env 10
-      - 85  # rls2206.rel NDRPDR reconf iter env 10
-      - 86  # rls2206.rel NDRPDR reconf iter env 10
-      - 87  # rls2206.rel NDRPDR reconf iter env 10
-
-  vpp-2n-skx-curr-iter-gso:
-    csit-vpp-perf-report-iterative-2206-2n-skx:
-      - 54  # rls2206.rel MRR GSO iter env 10
-
-  vpp-2n-skx-curr-cov:
-    csit-vpp-perf-report-coverage-2206-2n-skx:
-      - 1   # rls2206.rel NDRPDR cov env 10
-      - 2   # rls2206.rel NDRPDR cov env 10
-      - 3   # rls2206.rel NDRPDR cov env 10
-      - 4   # rls2206.rel NDRPDR cov env 10
-      - 5   # rls2206.rel NDRPDR cov env 10
-      - 6   # rls2206.rel NDRPDR cov env 10
-      - 7   # rls2206.rel NDRPDR cov env 10
-      - 8   # rls2206.rel NDRPDR cov env 10
-      - 9   # rls2206.rel NDRPDR cov env 10
-      - 10  # rls2206.rel NDRPDR cov env 10
-      - 11  # rls2206.rel NDRPDR cov env 10
-      - 12  # rls2206.rel NDRPDR cov env 10
-      - 13  # rls2206.rel NDRPDR cov env 10
-      - 14  # rls2206.rel NDRPDR cov env 10
-      - 15  # rls2206.rel NDRPDR cov env 10
-      - 16  # rls2206.rel NDRPDR cov env 10
-      - 17  # rls2206.rel NDRPDR cov env 10
-
-  dpdk-2n-skx-hist-iter:
-    csit-dpdk-perf-report-iterative-2110-2n-skx:
-      - 11  # rls2110 NDRPDR iter env 8
-      - 12  # rls2110 NDRPDR iter env 8
-      - 13  # rls2110 NDRPDR iter env 8
-      - 14  # rls2110 NDRPDR iter env 8
-      - 15  # rls2110 NDRPDR iter env 8
-      - 16  # rls2110 NDRPDR iter env 8
-      - 17  # rls2110 NDRPDR iter env 8
-      - 18  # rls2110 NDRPDR iter env 8
-      - 19  # rls2110 NDRPDR iter env 8
-      - 20  # rls2110 NDRPDR iter env 8
-
-  dpdk-2n-skx-prev-iter:
-    csit-dpdk-perf-report-iterative-2202-2n-skx:
-      - 11  # rls2202 NDRPDR iter env 9
-      - 13  # rls2202 NDRPDR iter env 9
-      - 14  # rls2202 NDRPDR iter env 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
-      - 19  # rls2202 NDRPDR iter env 9
-      - 20  # rls2202 NDRPDR iter env 9
-      - 21  # rls2202 NDRPDR iter env 9
-
-  dpdk-2n-skx-curr-iter:
-    csit-dpdk-perf-report-iterative-2206-2n-skx:
-      - 1   # rls2206 NDRPDR iter env 10
-      - 2   # rls2206 NDRPDR iter env 10
-      - 3   # rls2206 NDRPDR iter env 10
-      - 4   # rls2206 NDRPDR iter env 10
-      - 5   # rls2206 NDRPDR iter env 10
-      - 6   # rls2206 NDRPDR iter env 10
-      - 7   # rls2206 NDRPDR iter env 10
-      - 8   # rls2206 NDRPDR iter env 10
-      - 9   # rls2206 NDRPDR iter env 10
-      - 10  # rls2206 NDRPDR iter env 10
-
-  dpdk-2n-skx-curr-iter-best:
-    csit-dpdk-perf-report-iterative-2206-2n-skx:
-      - 1   # rls2206 NDRPDR iter env 10
-
-  trex-2n-skx-hist-iter:
-    csit-trex-perf-report-iterative-2110-2n-skx:
-      - 8   # rls2110.rel NDRPDR iter env 8
-      - 9   # rls2110.rel NDRPDR iter env 8
-      - 10  # rls2110.rel NDRPDR iter env 8
-      - 11  # rls2110.rel NDRPDR iter env 8
-      - 12  # rls2110.rel NDRPDR iter env 8
-      - 13  # rls2110.rel NDRPDR iter env 8
-      - 14  # rls2110.rel NDRPDR iter env 8
-      - 15  # rls2110.rel NDRPDR iter env 8
-      - 16  # rls2110.rel NDRPDR iter env 8
-      - 17  # rls2110.rel NDRPDR iter env 8
-
-  trex-2n-skx-prev-iter:
-    csit-trex-perf-report-iterative-2202-2n-skx:
-      - 1   # rls2202.rel NDRPDR iter env 9
-      - 2   # rls2202.rel NDRPDR iter env 9
-      - 3   # rls2202.rel NDRPDR iter env 9
-      - 4   # rls2202.rel NDRPDR iter env 9
-      - 5   # rls2202.rel NDRPDR iter env 9
-      - 6   # rls2202.rel NDRPDR iter env 9
-      - 7   # rls2202.rel NDRPDR iter env 9
-      - 8   # rls2202.rel NDRPDR iter env 9
-      - 9   # rls2202.rel NDRPDR iter env 9
-      - 10  # rls2202.rel NDRPDR iter env 9
-
-  trex-2n-skx-curr-iter:
-    csit-trex-perf-report-iterative-2206-2n-skx:
-      - 1   # rls2206.rel NDRPDR iter env 10
-      - 2   # rls2206.rel NDRPDR iter env 10
-      - 3   # rls2206.rel NDRPDR iter env 10
-      - 4   # rls2206.rel NDRPDR iter env 10
-      - 5   # rls2206.rel NDRPDR iter env 10
-      - 6   # rls2206.rel NDRPDR iter env 10
-      - 7   # rls2206.rel NDRPDR iter env 10
-      - 8   # rls2206.rel NDRPDR iter env 10
-      - 9   # rls2206.rel NDRPDR iter env 10
-      - 10  # rls2206.rel NDRPDR iter env 10
-
-  trex-2n-skx-curr-iter-best:
-    csit-trex-perf-report-iterative-2206-2n-skx:
-      - 1   # rls2206.rel NDRPDR iter env 10
-
-  trex-2n-skx-curr-cov:
-    csit-trex-perf-report-coverage-2206-2n-skx:
-      - 1   # rls2206.rel NDRPDR cov env 10
+  # TRex 2n-skx
+
+  # trex-2n-skx-hist-iter:
+  #   csit-trex-perf-report-iterative-2110-2n-skx:
+  #     - 8   # rls2110.rel NDRPDR iter env 8
+  #     - 9   # rls2110.rel NDRPDR iter env 8
+  #     - 10  # rls2110.rel NDRPDR iter env 8
+  #     - 11  # rls2110.rel NDRPDR iter env 8
+  #     - 12  # rls2110.rel NDRPDR iter env 8
+  #     - 13  # rls2110.rel NDRPDR iter env 8
+  #     - 14  # rls2110.rel NDRPDR iter env 8
+  #     - 15  # rls2110.rel NDRPDR iter env 8
+  #     - 16  # rls2110.rel NDRPDR iter env 8
+  #     - 17  # rls2110.rel NDRPDR iter env 8
+
+  # trex-2n-skx-prev-iter:
+  #   csit-trex-perf-report-iterative-2202-2n-skx:
+  #     - 1   # rls2202.rel NDRPDR iter env 9
+  #     - 2   # rls2202.rel NDRPDR iter env 9
+  #     - 3   # rls2202.rel NDRPDR iter env 9
+  #     - 4   # rls2202.rel NDRPDR iter env 9
+  #     - 5   # rls2202.rel NDRPDR iter env 9
+  #     - 6   # rls2202.rel NDRPDR iter env 9
+  #     - 7   # rls2202.rel NDRPDR iter env 9
+  #     - 8   # rls2202.rel NDRPDR iter env 9
+  #     - 9   # rls2202.rel NDRPDR iter env 9
+  #     - 10  # rls2202.rel NDRPDR iter env 9
+
+  # trex-2n-skx-curr-iter:
+  #   csit-trex-perf-report-iterative-2206-2n-skx:
+  #     - 1   # rls2206.rel NDRPDR iter env 10
+  #     - 2   # rls2206.rel NDRPDR iter env 10
+  #     - 3   # rls2206.rel NDRPDR iter env 10
+  #     - 4   # rls2206.rel NDRPDR iter env 10
+  #     - 5   # rls2206.rel NDRPDR iter env 10
+  #     - 6   # rls2206.rel NDRPDR iter env 10
+  #     - 7   # rls2206.rel NDRPDR iter env 10
+  #     - 8   # rls2206.rel NDRPDR iter env 10
+  #     - 9   # rls2206.rel NDRPDR iter env 10
+  #     - 10  # rls2206.rel NDRPDR iter env 10
+
+  # trex-2n-skx-curr-iter-best:
+  #   csit-trex-perf-report-iterative-2206-2n-skx:
+  #     - 1   # rls2206.rel NDRPDR iter env 10
+
+  # trex-2n-skx-curr-cov:
+  #   csit-trex-perf-report-coverage-2206-2n-skx:
+  #     - 1   # rls2206.rel NDRPDR cov env 10
 
   # 2n-zn2
 
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 73ea925b1f..b05a2d2e5a 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -301,73 +301,6 @@
 #       build: "1"
 
 - type: "table"
-  title: "Job Specification Duration: 2n-skx-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-skx-curr-iter"
-    - job-spec: "vpp-gso-mrr-00"
-      data-set: "vpp-2n-skx-curr-iter-gso"
-    - job-spec: "soak-00"
-      data-set: "vpp-2n-skx-curr-soak"
-    - job-spec: "nfv-density-mrr-00"
-      data-set: "vpp-2n-skx-curr-nfv-mrr"
-    - job-spec: "nfv-density-mlr-00"
-      data-set: "vpp-2n-skx-curr-nfv-ndrpdr"
-    - job-spec: "reconf-00"
-      data-set: "vpp-2n-skx-curr-nfv-reconf"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - job-spec: "trex-mlr-00"
-      data-set: "trex-2n-skx-curr-iter"
-
-- type: "table"
-  title: "Job Specification Duration: 2n-skx-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
-  jb-type: "coverage"
-  data: "vpp-2n-skx-curr-cov"
-  lines:
-    - job-spec: "gso-00"
-      build: "1"
-    - job-spec: "ip4-00"
-      build: "2"
-    - job-spec: "ip4-01"
-      build: "3"
-    - job-spec: "ip4-02"
-      build: "4"
-    - job-spec: "ip4-03"
-      build: "5"
-    - job-spec: "ip4-04"
-      build: "6"
-    - job-spec: "ip4-05"
-      build: "7"
-    - job-spec: "ip4-06"
-      build: "8"
-    - job-spec: "ip4-07"
-      build: "9"
-    - job-spec: "ip4tun-00"
-      build: "10"
-    - job-spec: "ip6-00"
-      build: "11"
-    - job-spec: "ip6-01"
-      build: "12"
-    - job-spec: "l2-00"
-      build: "13"
-    - job-spec: "l2-01"
-      build: "14"
-    - job-spec: "lb-00"
-      build: "15"
-    - job-spec: "memif-00"
-      build: "16"
-    - job-spec: "vhost-00"
-      build: "17"
-
-- type: "table"
   title: "Job Specification Duration: 2n-tx2-iterative"
   algorithm: "table_job_spec_duration"
   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-iter"
@@ -507,97 +440,6 @@
       build: "10"
 
 - type: "table"
-  title: "Job Specification Duration: 3n-skx-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-3n-skx-curr-iter"
-    - job-spec: "hoststack-00"
-      data-set: "vpp-3n-skx-curr-iter-hoststack"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-3n-skx-curr-iter"
-
-- type: "table"
-  title: "Job Specification Duration: 3n-skx-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
-  jb-type: "coverage"
-  data: "vpp-3n-skx-curr-cov"
-  lines:
-    - job-spec: "crypto-00"
-      build: "1"
-    - job-spec: "crypto-01"
-      build: "2"
-    - job-spec: "crypto-02"
-      build: "3"
-    - job-spec: "crypto-03"
-      build: "34"
-    - job-spec: "crypto-04"
-      build: "4"
-    - job-spec: "ip4-00"
-      build: "5"
-    - job-spec: "ip4-01"
-      build: "6"
-    - job-spec: "ip4-02"
-      build: "7"
-    - job-spec: "ip4-03"
-      build: "8"
-    - job-spec: "ip4-04"
-      build: "9"
-    - job-spec: "ip4-05"
-      build: "10"
-    - job-spec: "ip4-06"
-      build: "11"
-    - job-spec: "ip4-07"
-      build: "12"
-    - job-spec: "ip4tun-00"
-      build: "13"
-    - job-spec: "ip4tun-02"
-      build: "14"
-    - job-spec: "ip6-00"
-      build: "15"
-    - job-spec: "ip6-01"
-      build: "16"
-    - job-spec: "ip6tun-00"
-      build: "17"
-    - job-spec: "l2-00"
-      build: "18"
-    - job-spec: "l2-01"
-      build: "19"
-    - job-spec: "l2-02"
-      build: "20"
-    - job-spec: "l2-03"
-      build: "21"
-    - job-spec: "l2-04"
-      build: "22"
-    - job-spec: "l2-05"
-      build: "23"
-    - job-spec: "l2-06"
-      build: "24"
-    - job-spec: "l2-07"
-      build: "25"
-    - job-spec: "l2-08"
-      build: "26"
-    - job-spec: "l2-09"
-      build: "27"
-    - job-spec: "l2-10"
-      build: "28"
-    - job-spec: "memif-00"
-      build: "29"
-    - job-spec: "srv6-00"
-      build: "30"
-    - job-spec: "srv6-01"
-      build: "31"
-    - job-spec: "vhost-00"
-      build: "32"
-    - job-spec: "vhost-01"
-      build: "33"
-
-- type: "table"
   title: "Job Specification Duration: 3n-tsh-iterative"
   algorithm: "table_job_spec_duration"
   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-iter"
@@ -707,118 +549,6 @@
     - job-spec: "vhost-01"
       build: "17"
 
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 # VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
 - type: "table"
   title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
@@ -931,314 +661,6 @@
     - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr"
-  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' and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "3n-icx xxv710"
-      data-set: "vpp-3n-icx-curr-iter"
-  comparisons:
-    - title: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx ndr"
-  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' and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "3n-icx xxv710"
-      data-set: "vpp-3n-icx-curr-iter"
-  comparisons:
-    - title: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr"
-  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' and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "3n-icx xxv710"
-      data-set: "vpp-3n-icx-curr-iter"
-  comparisons:
-    - title: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr"
-  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' and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "3n-icx xxv710"
-      data-set: "vpp-3n-icx-curr-iter"
-  comparisons:
-    - title: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 # VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr
 - type: "table"
   title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr"
@@ -1323,230 +745,6 @@
     - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-icx vs 2n-clx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 4c mrr
-- type: "table"
-  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-icx xxv710"
-      data-set: "vpp-2n-icx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
-    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr
-- type: "table"
-  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr
-- type: "table"
-  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs TB3n-skxR: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr
-- type: "table"
-  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx ndr
-- type: "table"
-  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx pdr
-- type: "table"
-  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx xxv710"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-clx vs 2n-skx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-clx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
-    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 # DPDK Normalized Comparison Across Testbeds 2n-clx to 2n-icx ndr
 - type: "table"
   title: "DPDK Normalized Comparison Across Testbeds 2n-clx to 2n-icx ndr"
@@ -1603,304 +801,6 @@
     - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx ndr
-- type: "table"
-  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-icx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "dpdk-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-clx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-icx and 2n-icx with xxv710.'
-    - '2n-icx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-icx vs 2n-icx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-icx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx pdr
-- type: "table"
-  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-icx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-icx xxv710"
-      data-set: "dpdk-2n-icx-curr-iter"
-  comparisons:
-    - title: "2n-icx vs 2n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 2n-icx vs 2n-clx"
-      reference: 1
-      compare: 2
-      norm-ref: "2n-skx"
-      norm-cmp: "2n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-icx and T2n-icxBC with xxv710.'
-    - '2n-icx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-icx vs 2n-icx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 2n-icx vs 2n-icx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Normalized Comparison Across Testbeds 3n-skx to 3n-icx ndr
-- type: "table"
-  title: "DPDK Normalized 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: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-clx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Normalized Comparison Across Testbeds 3n-skx to 3n-icx pdr
-- type: "table"
-  title: "DPDK Normalized 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: "3n-icx vs 3n-skx"
-      reference: 1
-      compare: 2
-    - title: "Normalized 3n-icx vs 3n-clx"
-      reference: 1
-      compare: 2
-      norm-ref: "3n-skx"
-      norm-cmp: "3n-icx"
-  legend:
-    - ''
-    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
-    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Latency Changes 3n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR50-direction1-avg"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg"
-  include-tests: "latency-PDR50-direction1-avg"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Latency Changes 3n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-avg"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg"
-  include-tests: "latency-PDR90-direction1-avg"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Latency Changes 3n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-max"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max"
-  include-tests: "latency-PDR90-direction1-max"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Latency Changes 2n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR50-direction1-avg"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg"
-  include-tests: "latency-PDR50-direction1-avg"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Latency Changes 2n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-avg"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg"
-  include-tests: "latency-PDR90-direction1-avg"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Latency Changes 2n-skx 2t1c
-- type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-max"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max"
-  include-tests: "latency-PDR90-direction1-max"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
   title: "VPP Latency Changes 2n-clx 2t1c PDR50-direction1-avg"
@@ -2571,25 +1471,6 @@
     - "name"
     - "parent"
 
-# VPP Soak vs NDR - 2n-skx
-- type: "table"
-  title: "VPP Soak vs NDR 2n-skx"
-  algorithm: "table_soak_vs_ndr"
-  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
-  reference:
-    title: "NDR"
-    data: "vpp-soak-vs-ndr-2n-skx-ref"
-  compare:
-    title: "Soak"
-    data: "vpp-2n-skx-curr-soak"
-  data: "vpp-soak-vs-ndr-2n-skx"
-  include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
-  parameters:
-    - "throughput"
-    - "name"
-    - "parent"
-
 # VPP Soak vs NDR - 2n-clx
 - type: "table"
   title: "VPP Soak vs NDR 2n-clx"
@@ -2611,370 +1492,9 @@
 
 ################################################################################
 
-# VPP Compare NICs 3n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: NDR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: NDR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: PDR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: PDR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 2t1c mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 4t2c mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 3n-skx 8t4c mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: NDR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: NDR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: PDR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: PDR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 2t1c mrr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 4t2c mrr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Compare NICs 2n-skx 8t4c mrr
-- type: "table"
-  title: "VPP Compare NICs 2n-skx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "xxv710 vs x710"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
-    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
-    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 ################################################################################
 # VPP
 
-# VPP Performance Changes 3n-skx Hoststack
-- type: "table"
-  title: "VPP Performance Changes 3n-skx Hoststack"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-hoststack"
-  include-tests: "hoststack"
-  filter: "all"
-  columns:
-    - title: "2110.0-8"
-      data-set: "vpp-3n-skx-hist-iter-hoststack-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-hoststack-old-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter-hoststack"
-  comparisons:
-    - title: "2206.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:             Test cases executed for: Hoststack on 3n-skx with xxv710.'
-    - 'YYMM.V-E:              [Mbps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:  [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
-
 # VPP Performance Changes 2n-clx VSAP
 - type: "table"
   title: "VPP Performance Changes 2n-clx VSAP"
@@ -3248,254 +1768,6 @@
     - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
     - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 3n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
   title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
@@ -4564,94 +2836,6 @@
 #     - 'YYMM.V-E vs YYMM.V-E:  [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 #     - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 # VPP Performance Changes 3n-icx 2t1c mrr
 - type: "table"
   title: "VPP Performance Changes 3n-icx 2t1c mrr"
@@ -4838,192 +3022,6 @@
     - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
     - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 3n-skx 2t1c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 8t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 8t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2110.0-9"
-      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2202.0-10"
-      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-10 vs 2202.0-9"
-      reference: 2
-      compare: 3
-    - title: "2206.0-10 vs 2202.0-10"
-      reference: 3
-      compare: 4
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
-    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
-    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
-
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
   title: "VPP Performance Changes 2n-clx-xxv710 2t1c mrr"
@@ -5775,108 +3773,6 @@
 #     - 'YYMM.V-E vs YYMM.V-E:  [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 #     - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
-- type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '4C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# Detailed Test Results - VPP Performance Results 3n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/"
-  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: "vpp-3n-skx-curr-cov"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - VPP Performance Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/"
-  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: "vpp-2n-skx-curr-cov"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - VPP Performance Results 2n-zn2
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-zn2"
@@ -6067,40 +3963,6 @@
 #   - "parent"
 #   - "msg"
 
-# Test configuration - VPP Performance Test Configs 3n-skx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/"
-  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-3n-skx-curr-cov"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test configuration - VPP Performance Test Configs 2n-skx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/"
-  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-2n-skx-curr-cov"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
 # Test configuration - VPP Performance Test Configs 2n-zn2
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-zn2"
@@ -6290,22 +4152,6 @@
 #   - "name"
 #   - "conf-history"
 
-# Test Operational Data - VPP Performance Operational Data 3n-skx
-- type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
-  algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/"
-  data: "vpp-3n-skx-curr-cov"
-  filter: "all"
-
-# Test Operational Data - VPP Performance Operational Data 2n-skx
-- type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
-  algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/"
-  data: "vpp-2n-skx-curr-cov"
-  filter: "all"
-
 # Test Operational Data - VPP Performance Operational Data 2n-zn2
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-zn2"
@@ -6394,40 +4240,6 @@
 #   data: "vpp-3n-aws-curr-cov"
 #   filter: "all"
 
-# Detailed Test Results - VPP MRR Results 3n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-      data: "data msg"
-  data: "vpp-3n-skx-curr-iter-mrr"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - VPP MRR Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP MRR Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-      data: "data msg"
-  data: "vpp-2n-skx-curr-iter-mrr"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - VPP MRR Results 2n-zn2
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-zn2"
@@ -6615,40 +4427,6 @@
 #   - "parent"
 #   - "msg"
 
-# Test configuration - VPP MRR Test Configs 3n-skx
-- type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/"
-  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-3n-skx-curr-iter-mrr"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test configuration - VPP MRR Test Configs 2n-skx
-- type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/"
-  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-2n-skx-curr-iter-mrr"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
 # Test configuration - VPP MRR Test Configs 2n-zn2
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-zn2"
@@ -7065,198 +4843,6 @@
     - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
     - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# DPDK Performance Changes 3n-skx 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 3n-skx 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 3n-skx 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 3n-skx 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-3n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-3n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-3n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 2n-skx 2t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 2n-skx 4t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 2n-skx 2t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Performance Changes 2n-skx 4t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "21.08"
-      data-set: "dpdk-2n-skx-hist-iter"
-    - title: "21.11"
-      data-set: "dpdk-2n-skx-prev-iter"
-    - title: "22.03"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "22.03 vs 21.11"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:           Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
-    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
   title: "DPDK Performance Changes 2n-clx 2t1c pdr"
@@ -7641,86 +5227,6 @@
     - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
     - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
-- type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
-- type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "3n-skx xxv710"
-      data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx xxv710"
-      data-set: "dpdk-2n-skx-curr-iter"
-  comparisons:
-    - title: "2n-skx vs 3n-skx"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
-    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for DPDK tested in CSIT'
-    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-
-# Detailed Test Results - DPDK Performance Results 3n-skx
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
-  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-skx-curr-iter-best"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
-  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-skx-curr-iter-best"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - DPDK Performance Results 2n-zn2
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-zn2"
@@ -7841,24 +5347,6 @@
   - "parent"
   - "msg"
 
-# Detailed Test Results - TRex Performance Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - TRex Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,TREX,2N,SKX]}/trex_performance_results_2n_skx"
-  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: "trex-2n-skx-curr-cov"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
@@ -7869,8 +5357,6 @@
   algorithm: "file_details_split"
   output-file: "{DIR[DTR,PERF,VPP,ALL]}"
   dir-tables:
-    - "{DIR[DTR,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTR,PERF,VPP,3N,SKX]}"
     - "{DIR[DTR,PERF,VPP,2N,CLX]}"
     - "{DIR[DTR,PERF,VPP,2N,ICX]}"
     - "{DIR[DTR,PERF,VPP,3N,ICX]}"
@@ -7883,8 +5369,6 @@
     - "{DIR[DTR,PERF,VPP,2N,AWS]}"
     # - "{DIR[DTR,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-2n-skx-curr-cov"
-    - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
     - "vpp-3n-icx-curr-cov"
@@ -7914,8 +5398,6 @@
       - "nfv_density"
       - "hoststack"
     level-2:
-      - "2n-skx"
-      - "3n-skx"
       - "2n-clx"
       - "2n-icx"
       - "3n-icx"
@@ -7945,8 +5427,6 @@
   algorithm: "file_details_split"
   output-file: "{DIR[DTC,PERF,VPP,ALL]}"
   dir-tables:
-    - "{DIR[DTC,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTC,PERF,VPP,3N,SKX]}"
     - "{DIR[DTC,PERF,VPP,2N,CLX]}"
     - "{DIR[DTC,PERF,VPP,2N,ICX]}"
     - "{DIR[DTC,PERF,VPP,3N,ICX]}"
@@ -7959,8 +5439,6 @@
     - "{DIR[DTC,PERF,VPP,2N,AWS]}"
     # - "{DIR[DTC,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-2n-skx-curr-cov"
-    - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
     - "vpp-3n-icx-curr-cov"
@@ -7990,8 +5468,6 @@
       - "nfv_density"
       - "hoststack"
     level-2:
-      - "2n-skx"
-      - "3n-skx"
       - "2n-clx"
       - "2n-icx"
       - "3n-icx"
@@ -8021,8 +5497,6 @@
   algorithm: "file_details_split_html"
   output-file: "{DIR[DTO,PERF,VPP,ALL]}"
   dir-tables:
-    - "{DIR[DTO,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTO,PERF,VPP,3N,SKX]}"
     - "{DIR[DTO,PERF,VPP,2N,CLX]}"
     - "{DIR[DTO,PERF,VPP,2N,ICX]}"
     - "{DIR[DTO,PERF,VPP,3N,ICX]}"
@@ -8035,8 +5509,6 @@
     - "{DIR[DTO,PERF,VPP,2N,AWS]}"
     # - "{DIR[DTO,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-2n-skx-curr-cov"
-    - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
     - "vpp-3n-icx-curr-cov"
@@ -8066,8 +5538,6 @@
       - "nfv_density"
       - "hoststack"
     level-2:
-      - "2n-skx"
-      - "3n-skx"
       - "2n-clx"
       - "2n-icx"
       - "3n-icx"
@@ -8097,8 +5567,6 @@
   algorithm: "file_details_split"
   output-file: "{DIR[DTR,MRR,VPP,ALL]}"
   dir-tables:
-    - "{DIR[DTR,MRR,VPP,2N,SKX]}"
-    - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
@@ -8111,8 +5579,6 @@
     - "{DIR[DTR,MRR,VPP,2N,AWS]}"
     # - "{DIR[DTR,MRR,VPP,3N,AWS]}"
   data:
-    - "vpp-2n-skx-curr-iter-mrr"
-    - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
     - "vpp-3n-icx-curr-iter-mrr"
@@ -8142,8 +5608,6 @@
       - "nfv_density"
       - "hoststack"
     level-2:
-      - "2n-skx"
-      - "3n-skx"
       - "2n-clx"
       - "2n-icx"
       - "3n-icx"
@@ -8173,8 +5637,6 @@
   algorithm: "file_details_split"
   output-file: "{DIR[DTC,MRR,VPP,ALL]}"
   dir-tables:
-    - "{DIR[DTC,MRR,VPP,2N,SKX]}"
-    - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
@@ -8187,8 +5649,6 @@
     - "{DIR[DTC,MRR,VPP,2N,AWS]}"
     # - "{DIR[DTC,MRR,VPP,3N,AWS]}"
   data:
-    - "vpp-2n-skx-curr-iter-mrr"
-    - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
     - "vpp-3n-icx-curr-iter-mrr"
@@ -8218,8 +5678,6 @@
       - "nfv_density"
       - "hoststack"
     level-2:
-      - "2n-skx"
-      - "3n-skx"
       - "2n-clx"
       - "2n-icx"
       - "3n-icx"
@@ -8263,26 +5721,6 @@
   filter: "all"
   data-start-level: 4
 
-# DPDK Performance Results 3n-skx
-- type: "file"
-  title: "DPDK Performance Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  data: "dpdk-3n-skx-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 2n-skx
-- type: "file"
-  title: "DPDK Performance Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  data: "dpdk-2n-skx-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
-
 # DPDK Performance Results 2n-zn2
 - type: "file"
   title: "DPDK Performance Results 2n-zn2"
@@ -8373,16 +5811,6 @@
   filter: "all"
   data-start-level: 4
 
-# TRex Performance Results 2n-skx
-- type: "file"
-  title: "TRex Performance Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,TREX,2N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,TREX,2N,SKX]}"
-  data: "trex-2n-skx-curr-cov"
-  filter: "all"
-  data-start-level: 4
-
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
@@ -8565,46 +5993,6 @@
     title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
-# Hoststack tests 3n-skx
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho-bps"
-  data: "vpp-3n-skx-curr-iter-hoststack"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicbase-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
-  layout:
-    title: "3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
-    layout: "plot-hoststack"
-
 ################################################################################
 
 # Soak Test (PLRsearch), boxes - 2n-icx
@@ -8679,42 +6067,6 @@
     title: "30 Minutes Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak Test (PLRsearch), boxes - 2n-skx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-1"
-  data: "vpp-2n-skx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak Test (PLRsearch), boxes - 2n-skx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-2"
-  data: "vpp-2n-skx-curr-soak"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
 ###############################################################################
 
 # Reconf tests 2n-icx
@@ -8738,27 +6090,6 @@
 
 ###############################################################################
 
-# Reconf tests 2n-skx
-
-- type: "plot"
-  title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
-  data: "vpp-2n-skx-curr-nfv-reconf"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
-  layout:
-    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
-    layout: "plot-throughput"
-
-###############################################################################
-
 # Reconf tests 2n-clx
 
 - type: "plot"
@@ -8964,192 +6295,6 @@
 
 ###############################################################################
 
-# Plots - NF Density - 2n-skx - VSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC vxlan - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-mrr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - VSC vxlan - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr"
-  x-axis: "X = VNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-skx - CSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - CSC - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
-# Plots - NF Density - 2n-skx - CSP - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-mrr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  test-type: ["mrr", ]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-# Plots - NF Density - 2n-skx - CSP - NDRPDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "vpp-2n-skx-curr-nfv-ndrpdr"
-  core: ["2t1c", "4t2c", "8t4c"]
-  include:
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
-    layout: "plot-service-density"
-
-###############################################################################
-
 # Plots - NF Density - 2n-clx - VSC - MRR IMIX
 - type: "plot"
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
@@ -9338,301 +6483,6 @@
 # Packet Throughput
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-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"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-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-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-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-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-  data: "vpp-2n-skx-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-h4096-p63-s258048-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h4096-p63-s258048-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"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-  data: "vpp-2n-skx-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"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-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-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-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"
-    - "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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-    layout: "plot-cps"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-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"
-    - "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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-    layout: "plot-cps"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-{core}-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
-    layout: "plot-throughput"
-
-# - type: "plot"
-#   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-#   data: "vpp-3n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-#     layout: "plot-throughput"
-
-# - type: "plot"
-#   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-#   data: "vpp-3n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-#     layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
@@ -9788,23 +6638,6 @@
 #     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
@@ -9831,100 +6664,6 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
-  layout:
-    title: "2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-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-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-78b-{core}-ip6routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-ip6routing-base-ixgbe-{test_type}"
@@ -9966,80 +6705,6 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-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-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  data: "vpp-3n-skx-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-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
@@ -10074,149 +6739,6 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-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"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-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"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-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-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput"
-
-# - type: "plot"
-#   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
-#   data: "vpp-3n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
-#     layout: "plot-throughput"
-
-# - type: "plot"
-#   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-#   data: "vpp-3n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-#     layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
@@ -10329,40 +6851,6 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
-  data: "vpp-3n-skx-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-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-# - type: "plot"
-#   title: "Throughput: 3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-#   data: "vpp-3n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-#     layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-78b-{core}-srv6-ip6routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-srv6-ip6routing-base-ixgbe-{test_type}"
@@ -10380,36 +6868,6 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-vpp-{test_type}"
-  data: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-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-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
@@ -10900,603 +7358,6 @@
 # Packet Speedup
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-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"
-  layout:
-    title: "2n-skx-xxv710-64b-memif-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-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-skx-xxv710-64b-memif-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-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-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-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-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-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"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-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"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-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-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis-cps"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis-cps"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-100B-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-ip4routing-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-# - type: "plot"
-#   title: "Speedup: 3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-#   data: "vpp-3n-skx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-
-# - type: "plot"
-#   title: "Speedup: 3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-#   data: "vpp-3n-skx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-[avf,dpdk]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-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-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-ip4tunnel-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
-  layout:
-    title: "2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-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-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
-  data: "vpp-2n-skx-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-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "3n-skx-x710-78b-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-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"
-  layout:
-    title: "3n-skx-xxv710-78b-ip6routing-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "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-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-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-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-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-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-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-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-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-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-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-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-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-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
-    - "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"
-  layout:
-    title: "2n-skx-xxv710-64b-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "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"
-  layout:
-    title: "2n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-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-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-skx-xxv710-64b-l2switching-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-# - type: "plot"
-#   title: "Speedup: 3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}-tsa"
-#   data: "vpp-3n-skx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#   layout:
-#     title: "3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
-  data: "vpp-3n-skx-curr-iter"
-  include:
-    - "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-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-{test_type}-tsa"
-  data: "vpp-2n-skx-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-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-vpp-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
-  include:
-    - "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-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-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-skx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
   title: "Speedup: 3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
@@ -12263,110 +8124,6 @@
 
 # Packet Throughput - DPDK
 
-# 2n-skx
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-skx-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-skx-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-skx-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-skx-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-base-{test_type}-tsa"
-  data: "dpdk-2n-skx-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-skx-xxv710-64b-base-{test_type}-tsa"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-base-{test_type}-tsa"
-  data: "dpdk-2n-skx-curr-iter"
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b-base-{test_type}-tsa"
-    layout: "plot-throughput-speedup-analysis"
-
-# 3n-skx
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-skx-xxv710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "dpdk-3n-skx-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-skx-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-skx-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-x710-64b-{core}-base-{test_type}"
-  data: "dpdk-3n-skx-curr-iter"
-  core: ["2t1c", "4t2c"]
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-xxv710-64b-base-{test_type}-tsa"
-  data: "dpdk-3n-skx-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-skx-xxv710-64b-base-{test_type}-tsa"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-64b-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-skx-x710-64b-base-{test_type}-tsa"
-  data: "dpdk-3n-skx-curr-iter"
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-base-{test_type}-tsa"
-    layout: "plot-throughput-speedup-analysis"
-
 # 3n-tsh-x520
 
 - type: "plot"
@@ -14166,7 +9923,7 @@
   title: "Speedup: 2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-  data: "vpp-2n-skx-curr-iter"
+  data: "vpp-2n-icx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
@@ -15929,27 +11686,16 @@
 
 ################################################################################
 
-- type: "plot"
-  title: "Latency by percentile: 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-2n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: TRex 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,TREX]}/2n_skx.rst"
-  target-links: "../../_static/trex"
-  data: "trex-2n-skx-curr-iter-best"
-  filter: "'NIC_Intel-X710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
+# - type: "plot"
+#   title: "Latency by percentile: TRex 2n-skx"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-skx"
+#   output-file-links: "{DIR[LAT,TREX]}/2n_skx.rst"
+#   target-links: "../../_static/trex"
+#   data: "trex-2n-skx-curr-iter-best"
+#   filter: "'NIC_Intel-X710'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
@@ -15963,17 +11709,6 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-skx"
-  output-file-links: "{DIR[LAT,VPP]}/3n_skx.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-3n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
   title: "Latency by percentile: 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
@@ -16106,28 +11841,6 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: DPDK 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,DPDK]}/2n_skx.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-2n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: DPDK 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-skx"
-  output-file-links: "{DIR[LAT,DPDK]}/3n_skx.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-3n-skx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
   title: "Latency by percentile: DPDK 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-clx"
@@ -16202,21 +11915,6 @@
     layout: "plot-throughput-gbps"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-128kb-{core}-ip4routing-iperf3"
-  algorithm: "plot_mrr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-128kb-{core}-ip4routing-iperf3"
-  data: "vpp-2n-skx-curr-iter-gso"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
-    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
-  layout:
-    title: "2n-skx-128kb-{core}-ip4routing-iperf3"
-    layout: "plot-throughput-gbps"
-
-- type: "plot"
   title: "Throughput: 2n-clx-128kb-{core}-ip4routing-iperf3"
   algorithm: "plot_mrr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-128kb-{core}-ip4routing-iperf3"
@@ -16250,70 +11948,70 @@
 
 # TRex 2n-skx
 
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b--ip4-base-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4-base-scale-{test_type}"
-  data: "trex-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "Throughput: 2n-skx-x710-64b--ip4-base-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4-base-scale-{test_type}"
+#   data: "trex-2n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+#   layout:
+#     title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-  data: "trex-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#   data: "trex-2n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+#   layout:
+#     title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-  data: "trex-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#   data: "trex-2n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+#   layout:
+#     title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-78b--ip6-base-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-78b--ip6-base-scale-{test_type}"
-  data: "trex-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
-  layout:
-    title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "Throughput: 2n-skx-x710-78b--ip6-base-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-78b--ip6-base-scale-{test_type}"
+#   data: "trex-2n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+#   layout:
+#     title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b--l2-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--l2-scale-{test_type}"
-  data: "trex-2n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
-  layout:
-    title: "2n-skx-x710-64b--l2-scale-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "Throughput: 2n-skx-x710-64b--l2-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--l2-scale-{test_type}"
+#   data: "trex-2n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+#   layout:
+#     title: "2n-skx-x710-64b--l2-scale-{test_type}"
+#     layout: "plot-throughput"
diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index f4b05cfc74..940313b662 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -38,8 +38,6 @@
     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"
     DIR[DTR,PERF,DPDK,2N,CLX]: "{DIR[DTR]}/dpdk_performance_results_2n_clx"
     DIR[DTR,PERF,DPDK,2N,DNV]: "{DIR[DTR]}/dpdk_performance_results_2n_dnv"
@@ -47,10 +45,8 @@
     DIR[DTR,PERF,DPDK,3N,ALT]: "{DIR[DTR]}/dpdk_performance_results_3n_alt"
     DIR[DTR,PERF,DPDK,3N,TSH]: "{DIR[DTR]}/dpdk_performance_results_3n_tsh"
     DIR[DTR,PERF,DPDK,2N,TX2]: "{DIR[DTR]}/dpdk_performance_results_2n_tx2"
-    DIR[DTR,PERF,TREX,2N,SKX]: "{DIR[DTR]}/trex_performance_results_2n_skx"
+    # DIR[DTR,PERF,TREX,2N,SKX]: "{DIR[DTR]}/trex_performance_results_2n_skx"
     DIR[DTR,PERF,VPP,ALL]: "{DIR[DTR]}/vpp_performance_results"
-    DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
-    DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
     DIR[DTR,PERF,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_performance_results_2n_zn2"
     DIR[DTR,PERF,VPP,2N,CLX]: "{DIR[DTR]}/vpp_performance_results_2n_clx"
     DIR[DTR,PERF,VPP,2N,ICX]: "{DIR[DTR]}/vpp_performance_results_2n_icx"
@@ -63,8 +59,6 @@
     DIR[DTR,PERF,VPP,3N,AWS]: "{DIR[DTR]}/vpp_performance_results_3n_aws"
     DIR[DTR,PERF,VPP,2N,AWS]: "{DIR[DTR]}/vpp_performance_results_2n_aws"
     DIR[DTR,MRR,VPP,ALL]: "{DIR[DTR]}/vpp_mrr_results"
-    DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
-    DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
     DIR[DTR,MRR,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_mrr_results_2n_zn2"
     DIR[DTR,MRR,VPP,2N,CLX]: "{DIR[DTR]}/vpp_mrr_results_2n_clx"
     DIR[DTR,MRR,VPP,2N,ICX]: "{DIR[DTR]}/vpp_mrr_results_2n_icx"
@@ -81,8 +75,6 @@
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"
     DIR[DTC,PERF,VPP,ALL]: "{DIR[DTC]}/vpp_performance_configuration"
-    DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
-    DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
     DIR[DTC,PERF,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_performance_configuration_2n_zn2"
     DIR[DTC,PERF,VPP,2N,CLX]: "{DIR[DTC]}/vpp_performance_configuration_2n_clx"
     DIR[DTC,PERF,VPP,2N,ICX]: "{DIR[DTC]}/vpp_performance_configuration_2n_icx"
@@ -95,8 +87,6 @@
     DIR[DTC,PERF,VPP,3N,AWS]: "{DIR[DTC]}/vpp_performance_configuration_3n_aws"
     DIR[DTC,PERF,VPP,2N,AWS]: "{DIR[DTC]}/vpp_performance_configuration_2n_aws"
     DIR[DTC,MRR,VPP,ALL]: "{DIR[DTC]}/vpp_mrr_configuration"
-    DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
-    DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
     DIR[DTC,MRR,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_zn2"
     DIR[DTC,MRR,VPP,2N,CLX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_clx"
     DIR[DTC,MRR,VPP,2N,ICX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_icx"
@@ -113,8 +103,6 @@
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
     DIR[DTO,PERF,VPP,ALL]: "{DIR[DTO]}/vpp_performance_operational_data"
-    DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx"
-    DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
     DIR[DTO,PERF,VPP,2N,ZN2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_zn2"
     DIR[DTO,PERF,VPP,2N,CLX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_clx"
     DIR[DTO,PERF,VPP,2N,ICX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_icx"
diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py
index 4fbbebfbb0..f78b09091d 100644
--- a/resources/tools/presentation/sphinx_conf/report/conf.py
+++ b/resources/tools/presentation/sphinx_conf/report/conf.py
@@ -82,8 +82,6 @@ rst_epilog = u"""
 .. _build logs from FD.io trex performance job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-iterative-{srelease}-2n-skx
 .. _build logs from FD.io dpdk performance job 2n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-icx
 .. _build logs from FD.io dpdk performance job 3n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-3n-icx
-.. _build logs from FD.io dpdk performance job 3n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-3n-skx
-.. _build logs from FD.io dpdk performance job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-skx
 .. _build logs from FD.io dpdk performance job 2n-clx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-clx
 .. _build logs from FD.io dpdk performance job 2n-dnv: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-dnv
 .. _build logs from FD.io dpdk performance job 3n-dnv: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-3n-dnv
@@ -91,8 +89,6 @@ rst_epilog = u"""
 .. _build logs from FD.io dpdk performance job 3n-tsh: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-3n-tsh
 .. _build logs from FD.io dpdk performance job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-tx2
 .. _build logs from FD.io dpdk performance job 2n-zn2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-zn2
-.. _build logs from FD.io vpp performance job 3n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-3n-skx
-.. _build logs from FD.io vpp performance job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-2n-skx
 .. _build logs from FD.io vpp performance job 3n-alt: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-3n-alt
 .. _build logs from FD.io vpp performance job 3n-tsh: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-3n-tsh
 .. _build logs from FD.io vpp performance job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-2n-tx2
@@ -106,8 +102,6 @@ rst_epilog = u"""
 .. _build logs from FD.io vpp performance job 2n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-iterative-{srelease}-2n-aws
 .. _build logs from FD.io dpdk coverage job 2n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-icx
 .. _build logs from FD.io dpdk coverage job 3n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-3n-icx
-.. _build logs from FD.io dpdk coverage job 3n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-3n-skx
-.. _build logs from FD.io dpdk coverage job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-skx
 .. _build logs from FD.io dpdk coverage job 2n-clx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-clx
 .. _build logs from FD.io dpdk coverage job 2n-dnv: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-dnv
 .. _build logs from FD.io dpdk coverage job 3n-dnv: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-3n-dnv
@@ -116,8 +110,6 @@ rst_epilog = u"""
 .. _build logs from FD.io dpdk coverage job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-tx2
 .. _build logs from FD.io dpdk coverage job 2n-zn2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-zn2
 .. _build logs from FD.io trex coverage job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-coverage-{srelease}-2n-skx
-.. _build logs from FD.io vpp coverage job 3n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-skx
-.. _build logs from FD.io vpp coverage job 2n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-2n-skx
 .. _build logs from FD.io vpp coverage job 3n-alt: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-alt
 .. _build logs from FD.io vpp coverage job 3n-tsh: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-tsh
 .. _build logs from FD.io vpp coverage job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-2n-tx2