Report: Add DPDK 2n-skx

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

9 files changed, 520 insertions, 494 deletions

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
index 6e14312c36..55652376a2 100644
--- 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
@@ -14,13 +14,14 @@ types, in 1-core, 2-core and 4-core configurations.
     with RF result files csit-dpdk-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-NDR Comparison
-~~~~~~~~~~~~~~
+..
+    NDR Comparison
+    ~~~~~~~~~~~~~~
 
-Comparison tables in ASCII and CSV formats:
+    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>`_
+      - `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
 ~~~~~~~~~~~~~~
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 479658e7b5..894c6780fa 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
@@ -70,9 +70,10 @@ Comparison tables in ASCII and CSV formats:
       - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.csv>`_
       - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.csv>`_
 
-    2n-skx
-    ~~~~~~
+2n-skx
+~~~~~~
 
+..
     NDR Comparison
     ``````````````
 
@@ -83,12 +84,12 @@ Comparison tables in ASCII and CSV formats:
       - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-ndr.csv>`_
       - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.csv>`_
 
-    PDR Comparison
-    ``````````````
+PDR Comparison
+``````````````
 
-    Comparison tables in ASCII and CSV formats:
+Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.txt>`_
-      - `ASCII 4t1c 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 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
+  - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.txt>`_
+  - `ASCII 4t1c 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 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/index.rst b/docs/report/dpdk_performance_tests/comparisons/index.rst
index 368136b47d..3cb6e50be8 100644
--- a/docs/report/dpdk_performance_tests/comparisons/index.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/index.rst
@@ -22,8 +22,8 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
+    2n-skx_vs_2n-clx_testbeds
 
 ..
     3n-skx_vs_3n-hsw_testbeds
-    2n-skx_vs_2n-clx_testbeds
     3n-skx_vs_2n-skx_testbeds
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
new file mode 100644
index 0000000000..2300986e27
--- /dev/null
+++ b/docs/report/dpdk_performance_tests/packet_latency/2n-skx-xxv710.rst
@@ -0,0 +1,78 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+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=rls2001>`_.
+
+.. 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/index.rst b/docs/report/dpdk_performance_tests/packet_latency/index.rst
index 66f8b13892..29ac6f946d 100644
--- a/docs/report/dpdk_performance_tests/packet_latency/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_latency/index.rst
@@ -41,10 +41,10 @@ Additional information about graph data:
 .. toctree::
     :maxdepth: 3
 
+    2n-skx-xxv710
+    2n-clx-xxv710
     3n-hsw-xl710
     3n-tsh-x520
-    2n-clx-xxv710
 
 ..
-    2n-skx-xxv710
     3n-skx-xxv710
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
index 2495915d9d..027a51ad82 100644
--- 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
@@ -45,25 +45,26 @@ CSIT source code for the test cases used for plots can be found in
 64b-2t1c-base
 -------------
 
-.. raw:: html
+..
+    .. 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>
+        <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
+    .. 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}
+        \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
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
@@ -88,25 +89,26 @@ CSIT source code for the test cases used for plots can be found in
 64b-4t2c-base
 -------------
 
-.. raw:: html
+..
+    .. 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>
+        <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
+    .. 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}
+        \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
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
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
index 53ffa3ae76..ec64c9a21f 100644
--- 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
@@ -45,25 +45,26 @@ CSIT source code for the test cases used for plots can be found in
 64b-2t1c-base
 -------------
 
-.. raw:: html
+..
+    .. 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>
+        <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
+    .. 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}
+        \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
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
@@ -88,25 +89,26 @@ CSIT source code for the test cases used for plots can be found in
 64b-4t2c-base
 -------------
 
-.. raw:: html
+..
+    .. 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>
+        <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
+    .. 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}
+        \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
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
 .. raw:: html
 
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 c22211dba6..211426e753 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/index.rst
@@ -60,16 +60,16 @@ Additional information about graph data:
 .. toctree::
     :maxdepth: 3
 
+    2n-skx-xxv710
+    2n-skx-x710
+    2n-clx-xxv710
+    2n-clx-x710
     3n-hsw-xl710
     3n-hsw-x710
     2n-dnv-x553
     3n-dnv-x553
     3n-tsh-x520
-    2n-clx-xxv710
-    2n-clx-x710
 
 ..
-    2n-skx-xxv710
-    2n-skx-x710
     3n-skx-xxv710
     3n-skx-x710
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 7e0675aacc..0ba4d7f3a4 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -371,31 +371,16 @@
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 25  # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
+        - 36  # NDRPDR sel xxv710
+        - 37  # NDRPDR sel xxv710
+        - 38  # NDRPDR sel x710
+        - 39  # NDRPDR sel x710
+        - 40  # NDRPDR sel x710
 
     plot-dpdk-hdrh-lat-2n-skx:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
-        - 19  # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
 
     # 2n-clx
 
@@ -744,7 +729,8 @@
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
+        - 38  # NDRPDR sel x710
 
     dpdk-perf-results-2n-clx:
       csit-dpdk-perf-verify-2001-2n-clx:
@@ -1248,26 +1234,12 @@
         - 12  # NDRPDR sel
     dpdk-performance-changes-2n-skx-cmp:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 25  # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
+        - 36  # NDRPDR sel xxv710
+        - 37  # NDRPDR sel xxv710
+        - 38  # NDRPDR sel x710
+        - 39  # NDRPDR sel x710
+        - 40  # NDRPDR sel x710
     dpdk-performance-changes-2n-skx:
       - "dpdk-performance-changes-2n-skx-h1"
       - "dpdk-performance-changes-2n-skx-ref"
@@ -1424,26 +1396,12 @@
 
     dpdk-compare-testbeds-skx-clx-ref:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 25  # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
+        - 36  # NDRPDR sel xxv710
+        - 37  # NDRPDR sel xxv710
+        - 38  # NDRPDR sel x710
+        - 39  # NDRPDR sel x710
+        - 40  # NDRPDR sel x710
     dpdk-compare-testbeds-skx-clx-cmp:
       csit-dpdk-perf-verify-2001-2n-clx:
         - 15  # NDRPDR sel
@@ -1520,26 +1478,12 @@
         - 10  # NDRPDR sel
     dpdk-compare-topologies-cmp:
       csit-dpdk-perf-verify-2001-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 25  # NDRPDR sel
+        - 35  # NDRPDR sel xxv710
+        - 36  # NDRPDR sel xxv710
+        - 37  # NDRPDR sel xxv710
+        - 38  # NDRPDR sel x710
+        - 39  # NDRPDR sel x710
+        - 40  # NDRPDR sel x710
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
@@ -2605,49 +2549,36 @@
 #      - 9   # NDRPDR sel
 #      - 10  # NDRPDR sel
 
-#    csit-dpdk-perf-verify-1904-2n-skx:
-#      - 2   # NDRPDR sel
-#      - 3   # NDRPDR sel
-#      - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 8   # NDRPDR sel
-#      - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#    csit-dpdk-perf-verify-1908-2n-skx:
-#      - 2   # NDRPDR sel
-#      - 3   # NDRPDR sel
-#      - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 8   # NDRPDR sel
-#      - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#    csit-dpdk-perf-verify-2001-2n-skx:
-#      - 1   # NDRPDR sel
-#      - 2   # NDRPDR sel
-#      - 3   # NDRPDR sel
-#      - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 6   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 8   # NDRPDR sel
-#      - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 26  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 27  # NDRPDR sel
-#      - 21  # NDRPDR sel
-#      - 25  # NDRPDR sel
+    csit-dpdk-perf-verify-1904-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+    csit-dpdk-perf-verify-1908-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+    csit-dpdk-perf-verify-2001-2n-skx:
+      - 35  # NDRPDR sel xxv710
+      - 36  # NDRPDR sel xxv710
+      - 37  # NDRPDR sel xxv710
+      - 38  # NDRPDR sel x710
+      - 39  # NDRPDR sel x710
+      - 40  # NDRPDR sel x710
+
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
@@ -5426,95 +5357,95 @@
 #  - "name"
 #  - "parent"
 #  - "throughput"
-#
-## DPDK Performance Changes 2n-skx 2t1c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
-#  history:
-#    - title: "rls1904"
-#      data: "dpdk-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1908"
-#    data: "dpdk-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls2001"
-#    data: "dpdk-performance-changes-2n-skx-cmp"
-#  data: "dpdk-performance-changes-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## DPDK Performance Changes 2n-skx 4t2c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
-#  history:
-#    - title: "rls1904"
-#      data: "dpdk-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1908"
-#    data: "dpdk-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls2001"
-#    data: "dpdk-performance-changes-2n-skx-cmp"
-#  data: "dpdk-performance-changes-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## DPDK Performance Changes 2n-skx 2t1c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
-#  history:
-#    - title: "rls1904"
-#      data: "dpdk-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1908"
-#    data: "dpdk-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls2001"
-#    data: "dpdk-performance-changes-2n-skx-cmp"
-#  data: "dpdk-performance-changes-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## DPDK Performance Changes 2n-skx 4t2c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
-#  history:
-#    - title: "rls1904"
-#      data: "dpdk-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1908"
-#    data: "dpdk-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls2001"
-#    data: "dpdk-performance-changes-2n-skx-cmp"
-#  data: "dpdk-performance-changes-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
+
+# DPDK Performance Changes 2n-skx 2t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
+  history:
+    - title: "rls1904"
+      data: "dpdk-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1908"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls2001"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  history:
+    - title: "rls1904"
+      data: "dpdk-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1908"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls2001"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  history:
+    - title: "rls1904"
+      data: "dpdk-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1908"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls2001"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  history:
+    - title: "rls1904"
+      data: "dpdk-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1908"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls2001"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
 ## DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 #- type: "table"
 #  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
@@ -5552,82 +5483,82 @@
 #  - "name"
 #  - "parent"
 #  - "throughput"
-#
-## DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
-#- type: "table"
-#  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
-#  reference:
-#    title: "2-Node Skx"
-#    data: "dpdk-compare-testbeds-skx-clx-ref"
-#  compare:
-#    title: "2-Node Clx"
-#    data: "dpdk-compare-testbeds-skx-clx-cmp"
-#  data: "dpdk-compare-testbeds-skx-clx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
-#- type: "table"
-#  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
-#  algorithm: "table_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
-#  reference:
-#    title: "2-Node Skx"
-#    data: "dpdk-compare-testbeds-skx-clx-ref"
-#  compare:
-#    title: "2-Node Clx"
-#    data: "dpdk-compare-testbeds-skx-clx-cmp"
-#  data: "dpdk-compare-testbeds-skx-clx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## 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_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "dpdk-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "dpdk-compare-topologies-cmp"
-#  data: "dpdk-compare-topologies"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## 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_perf_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "dpdk-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "dpdk-compare-topologies-cmp"
-#  data: "dpdk-compare-topologies"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
+
+# DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
+  reference:
+    title: "2-Node Skx"
+    data: "dpdk-compare-testbeds-skx-clx-ref"
+  compare:
+    title: "2-Node Clx"
+    data: "dpdk-compare-testbeds-skx-clx-cmp"
+  data: "dpdk-compare-testbeds-skx-clx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
+  algorithm: "table_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
+  reference:
+    title: "2-Node Skx"
+    data: "dpdk-compare-testbeds-skx-clx-ref"
+  compare:
+    title: "2-Node Clx"
+    data: "dpdk-compare-testbeds-skx-clx-cmp"
+  data: "dpdk-compare-testbeds-skx-clx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# 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_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# 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_perf_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
 
 # Detailed Test Results - DPDK Performance Results 3n-hsw
 - type: "table"
@@ -5663,24 +5594,24 @@
 #  - "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-perf-results-2n-skx"
-#  filter: "all"
-#  remove-ndr: True  # Temporary solution: remove NDR results from test message
-#  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-perf-results-2n-skx"
+  filter: "all"
+  remove-ndr: True  # Temporary solution: remove NDR results from test message
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - DPDK Performance Results 2n-clx
 - type: "table"
@@ -6073,16 +6004,16 @@
 #  data: "dpdk-perf-results-3n-skx"
 #  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-perf-results-2n-skx"
-#  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-perf-results-2n-skx"
+  filter: "all"
+  data-start-level: 4
 
 # DPDK Performance Results 2n-clx
 - type: "file"
@@ -15927,104 +15858,104 @@
 
 # 2n-skx-xxv710
 
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-xxv710-64b-2t1c-base-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-2t1c-base-ndr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-xxv710-64b-2t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-xxv710-64b-4t2c-base-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-4t2c-base-ndr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-xxv710-64b-4t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-xxv710-64b-2t1c-base-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-2t1c-base-pdr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-xxv710-64b-2t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-xxv710-64b-4t2c-base-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-4t2c-base-pdr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-xxv710-64b-4t2c-base-pdr"
-#    layout: "plot-throughput"
-#
-## 2n-skx-x710
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-x710-64b-2t1c-base-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-2t1c-base-ndr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-x710-64b-2t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-x710-64b-4t2c-base-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-4t2c-base-ndr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-x710-64b-4t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-x710-64b-2t1c-base-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-2t1c-base-pdr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-x710-64b-2t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 2n-skx-x710-64b-4t2c-base-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-4t2c-base-pdr"
-#  data: "plot-dpdk-throughput-latency-2n-skx"
-#  include:
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-skx-x710-64b-4t2c-base-pdr"
-#    layout: "plot-throughput"
-#
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# 2n-skx-x710
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
 ## 3n-skx-xxv710
 #
 #- type: "plot"
@@ -17991,6 +17922,17 @@
     layout: "plot-hdrh-latency-by-percentile"
 
 - type: "plot"
+  title: "Latency by percentile: DPDK 2n-skx"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-skx"
+  output-file-links: "{DIR[LAT,DPDK]}/skx.rst"
+  target-links: "../../_static/dpdk"
+  data: "plot-dpdk-hdrh-lat-2n-skx"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"
+
+- type: "plot"
   title: "Latency by percentile: DPDK 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-clx"