From: Tibor Frank <tifrank@cisco.com>
Date: Mon, 19 Aug 2019 13:25:47 +0000 (+0200)
Subject: Report: Select tests by name, specifications
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=39d8a85dd7bcec88318469308c8ce576aae7dfb1

Report: Select tests by name, specifications

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

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
index 657f9509f2..787db812cf 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
@@ -28,16 +28,47 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-memif-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_features
---------------------------
+64b-2t1c-memif-base-i40e
+------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +77,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_features
---------------------------
+64b-8t4c-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +100,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-xxv710.rst
similarity index 53%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-xxv710.rst
index 204b3493fd..8afd784a01 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-xxv710.rst
@@ -28,36 +28,25 @@
 
     </script>
 
-3n-hsw-x520
-~~~~~~~~~~~
+..
+    ## 3n-skx-xxv710
+    ### 64b-?t?c-memif-base-i40e
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 
-78b-1t1c-base
--------------
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-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]{ip6-3n-hsw-x520-78b-1t1c-base-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+64b-2t1c-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base-pdr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +55,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-base
--------------
+64b-4t2c-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,18 +78,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+64b-8t4c-memif-base-i40e
+------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,10 +101,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
index 0ffeef5546..3c3fceb7dd 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
@@ -13,15 +13,9 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1908>`_.
 
 .. toctree::
 
-    container_memif-3n-hsw-x520
-    container_memif-3n-hsw-x710
-    container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
-    container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
+    container_memif-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x520.rst
deleted file mode 100644
index 64e385a135..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x520.rst
+++ /dev/null
@@ -1,120 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x710.rst
deleted file mode 100644
index 2cb8327855..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated-3n-hsw-x710.rst
+++ /dev/null
@@ -1,120 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
deleted file mode 100644
index 161fdd15f9..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-K8s Container Memif
-===================
-
-This section includes summary graphs of VPP Phy-to-Phy packet latency
-with CContainer Orchestrated Topologies measured at 100% of discovered NDR
-throughput rate. Latency is reported for VPP running in multiple configurations
-of VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
-physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1901>`_.
-
-.. toctree::
-
-    container_orchestrated-3n-hsw-x520
-    container_orchestrated-3n-hsw-x710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
index 73798a5f1f..b48265a5d3 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
@@ -52,11 +52,7 @@ Additional information about graph data:
     ip6
     srv6
     ip4_tunnels
-    ip6_tunnels
     vm_vhost
     container_memif
     ipsec
-
-..
-    container_orchestrated
     vts
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-x710.rst
index a95f0cc511..5b4bc3899a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-x710.rst
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ###  64b-?t?c-ip4routing-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <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-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,40 +55,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-64b-2t1c-features-iacl
-----------------------
+64b-4t2c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -88,21 +78,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-features-iacl
------------------------
+64b-8t4c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,6 +101,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-xxv710.rst
index ee261c7771..e1f8153875 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-2n-skx-xxv710.rst
@@ -28,16 +28,201 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-ip4routing-base-scale-avf
+    2n1l-10ge2p1xxv710-avf-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-features-ip4routing-base-i40e
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+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-lat.html"></iframe>
+    <p><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-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-ip4routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat.html"></iframe>
+    <p><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-4t2c-ip4routing-base-scale-avf-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-ip4routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat.html"></iframe>
+    <p><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-8t4c-ip4routing-base-scale-avf-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-features-ip4routing-base-i40e
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-features-ip4routing-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +231,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-8t4c-features-ip4routing-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +254,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x520.rst
deleted file mode 100644
index f001c6aa0c..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x520.rst
+++ /dev/null
@@ -1,258 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-oacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-oacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x710.rst
deleted file mode 100644
index 769781c414..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x710.rst
+++ /dev/null
@@ -1,259 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-1t1c-features-oacl
-    ----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat}
-                \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-2t2c-features-oacl
-    ----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat}
-                \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-xl710.rst
index 9de2ab4027..88f3c5f1df 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-xl710.rst
@@ -28,16 +28,46 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4scale2m-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base
--------------
+64b-1t1c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-ip4routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +76,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base
--------------
+64b-4t4c-ip4routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +99,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
index 9ea15c2ecd..25eba6ab4d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-?t?c-ip4routing-base-scale-avf-i40e
+    10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    10ge2p1x710-dot1q-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <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-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,13 +63,13 @@
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -77,128 +86,13 @@
 
     \clearpage
 
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-features-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-features-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-iacl
-----------------------
+64b-8t4c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -207,6 +101,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-8t4c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-skx-x710-64b-8t4c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..10f89153d4
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst
@@ -0,0 +1,258 @@
+
+.. 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-?t?c-ip4routing-base-scale-avf
+    10ge2p1xxv710-avf-eth-ip4base-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-feature-ip4routing-base-i40e
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
+3n-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/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat-lat.html"></iframe>
+    <p><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-scale-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-ip4routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat-lat.html"></iframe>
+    <p><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-4t2c-ip4routing-base-scale-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-ip4routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat-lat.html"></iframe>
+    <p><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-8t4c-ip4routing-base-scale-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-feature-ip4routing-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-feature-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-feature-ip4routing-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-feature-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-feature-ip4routing-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-feature-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
index b523cfde75..a3902e6d92 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
@@ -13,13 +13,12 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1908>`_.
 
 .. toctree::
 
-    ip4-3n-hsw-x520
-    ip4-3n-hsw-x710
-    ip4-3n-hsw-xl710
-    ip4-3n-skx-x710
-    ip4-2n-skx-x710
     ip4-2n-skx-xxv710
+    ip4-2n-skx-x710
+    ip4-3n-skx-xxv710
+    ip4-3n-skx-x710
+    ip4-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index fd00d6577f..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x520.rst
+++ /dev/null
@@ -1,121 +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-hsw-x520
-~~~~~~~~~~~
-
-..
-    64b-1t1c-base_and_scale
-    -----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-                \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-2t2c-base_and_scale
-    -----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-                \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x710.rst
deleted file mode 100644
index 838e84d443..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-x710.rst
+++ /dev/null
@@ -1,120 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-xl710.rst
similarity index 55%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-x520.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-xl710.rst
index 9e77d73cb8..4fbe6602e5 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-hsw-xl710.rst
@@ -28,36 +28,22 @@
 
     </script>
 
-3n-hsw-x520
-~~~~~~~~~~~
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-ip4tunnel-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 
-114b-1t1c
----------
+3n-hsw-xl710
+~~~~~~~~~~~~
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-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]{vts-3n-hsw-x520-114b-1t1c-ndr}
-            \label{fig:vts-3n-hsw-x520-114b-1t1c-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+64b-1t1c-ip4tunnel-base-i40e
+----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-pdr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +52,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-1t1c-pdr}
-            \label{fig:vts-3n-hsw-x520-114b-1t1c-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-114b-2t2c
----------
+64b-2t2c-ip4tunnel-base-i40e
+----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,18 +75,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-2t2c-ndr}
-            \label{fig:vts-3n-hsw-x520-114b-2t2c-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+64b-4t4c-ip4tunnel-base-i40e
+----------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +98,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-2t2c-pdr}
-            \label{fig:vts-3n-hsw-x520-114b-2t2c-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-x710.rst
deleted file mode 100644
index 52bac20bba..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-x710.rst
+++ /dev/null
@@ -1,120 +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-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-xxv710.rst
similarity index 52%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-dnv-x553.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-xxv710.rst
index f872bb3445..228724cd36 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-skx-xxv710.rst
@@ -27,19 +27,24 @@
         }
 
     </script>
+..
+    ## 3n-skx-xxv710
+    ### 64b-?t?c-ip4tunnel-base-scale-i40e
+    10ge2p1xxv710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 
-.. _packet_throughput_graphs_ip4-2n-dnv-x553:
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-2n-dnv-x553
-~~~~~~~~~~~
-
-64b-1t1c-base
--------------
+64b-2t1c-ip4tunnel-base-scale-i40e
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm73" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-1t1c-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -48,41 +53,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-dnv-x553-64b-1t1c-base-ndr}
-            \label{fig:ip4-2n-dnv-x553-64b-1t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm74" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-1t1c-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]{ip4-2n-dnv-x553-64b-1t1c-base-pdr}
-            \label{fig:ip4-2n-dnv-x553-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base
--------------
+64b-4t2c-ip4tunnel-base-scale-i40e
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm75" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-2t2c-base-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -91,18 +76,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-dnv-x553-64b-2t2c-base-ndr}
-            \label{fig:ip4-2n-dnv-x553-64b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+64b-8t4c-ip4tunnel-base-scale-i40e
+----------------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm76" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-2t2c-base-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,6 +99,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-dnv-x553-64b-2t2c-base-pdr}
-            \label{fig:ip4-2n-dnv-x553-64b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
index 924bf3eb2f..ac514d473a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
@@ -6,17 +6,16 @@
 IPv4 Tunnels
 ============
 
-This section includes summary graphs of VPP Phy-to-Phy packet latency
-with IPv4 Overlay Tunnels measured at 100% of discovered NDR throughput
-rate. Latency is reported for VPP running in multiple configurations of
-VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
-physical CPU core(s) placement.
+This section includes summary graphs of VPP Phy-to-Phy packet latency with
+IPv4 Overlay Tunnels measured at 100% of discovered NDR throughput rate.
+Latency is reported for VPP running in multiple configurations of VPP worker
+thread(s), a.k.a. VPP data plane thread(s), and their physical CPU core(s)
+placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1908>`_.
 
 .. toctree::
 
-    ip4_tunnels-3n-hsw-x520
-    ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-x710.rst
index 67df840620..dbbf03034e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-x710.rst
@@ -28,16 +28,45 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t2c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +75,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t2c-base_and_scale
------------------------
+78b-8t4c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +98,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-xxv710.rst
index ce52cf26ff..55153b1bc3 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-2n-skx-xxv710.rst
@@ -28,16 +28,48 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t2c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +78,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t2c-base_and_scale
------------------------
+78b-8t4c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +101,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x520.rst
deleted file mode 100644
index 584cd2d0b5..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-78b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x710.rst
deleted file mode 100644
index 9e8e5ce63a..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-78b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-xl710.rst
index 7107fda01a..a1951e6951 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-hsw-xl710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-1t1c-base
--------------
+78b-1t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,13 +61,13 @@
 
     \clearpage
 
-78b-2t2c-base
--------------
+78b-2t2c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,3 +79,26 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat}
             \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat}
     \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t4c-ip6routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-4t4c-base-ndr-lat}
+            \label{fig:ip6-3n-hsw-xl710-78b-4t4c-base-ndr-lat}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-x710.rst
index b5f0d71380..0912880812 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-x710.rst
@@ -28,16 +28,45 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1x710-ethip6-ip6base-ndrpdr
+    10ge2p1x710-ethip6-ip6scale2m-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t2c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +75,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t2c-base_and_scale
------------------------
+78b-8t4c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +98,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-xxv710.rst
index 10e1d9062d..817b6e2907 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-skx-xxv710.rst
@@ -28,16 +28,48 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
+
+.. 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-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t2c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +78,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t2c-base_and_scale
------------------------
+78b-8t4c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +101,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
index c0de92f969..b346c2a48c 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
@@ -13,14 +13,12 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1908>`_.
 
 .. toctree::
 
-    ip6-3n-hsw-x520
-    ip6-3n-hsw-x710
-    ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
-    ip6-2n-skx-x710
     ip6-2n-skx-xxv710
+    ip6-2n-skx-x710
+    ip6-3n-skx-xxv710
+    ip6-3n-skx-x710
+    ip6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index a26ced9404..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-78b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
deleted file mode 100644
index 4f86eef5b5..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-IPv6 Tunnels
-============
-
-This section includes summary graphs of VPP Phy-to-Phy packet latency
-with IPv6 Overlay Tunnels measured at 100% of discovered NDR throughput
-rate. Latency is reported for VPP running in multiple configurations of
-VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
-physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1901>`_.
-
-.. toctree::
-
-    ip6_tunnels-3n-hsw-x520
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst
index ac40ebedb4..055fea94ee 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst
@@ -28,16 +28,32 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+    ### imix-?t?c-ipsec-ip4routing-base-scale-hw-i40e
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base
---------------
+imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +62,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base
--------------
+imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
+    <iframe id="02 onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,21 +85,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-scale
---------------
+imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -92,21 +108,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-scale
---------------
+imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -115,21 +131,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-sw
------------
+imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +154,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-sw
------------
+imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,6 +177,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..9c960b9122
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-xxv710.rst
@@ -0,0 +1,107 @@
+
+.. 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-?t?c-ipsec-ip4routing-base-scale-i40e
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+imix-2t1c-ipsec-ip4routing-base-scale-i40e
+------------------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-4t2c-ipsec-ip4routing-base-scale-i40e
+------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-ipsec-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-8t4c-ipsec-ip4routing-base-scale-i40e
+------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-ipsec-ip4routing-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-i40e-ndr-lat}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
index 84c831c78e..fe0d054a5d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
@@ -16,8 +16,9 @@ a.k.a. VPP data plane thread(s), and their physical CPU core(s)
 placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1908>`_.
 
 .. toctree::
 
+    ipsec-3n-skx-xxv710
     ipsec-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-x710.rst
index bb4dc4d4f5..5ae2f608af 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-x710.rst
@@ -28,16 +28,49 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-l2switching-base-scale-avf-i40e
+----------------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +79,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-8t4c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +102,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat}
+            \label{fig:2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-xxv710.rst
index 64eaf55fec..baa49952c0 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-2n-skx-xxv710.rst
@@ -28,16 +28,199 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-l2switching-base-avf
+    2n1l-10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+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-lat.html"></iframe>
+    <p><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-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat.html"></iframe>
+    <p><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-4t2c-l2switching-base-avf-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-l2switching-base-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat.html"></iframe>
+    <p><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-8t4c-l2switching-base-avf-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-i40e
+------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-l2switching-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-l2switching-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-scale-i40e
+------------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +229,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-8t4c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +252,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x520.rst
deleted file mode 100644
index 470e67898c..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x520.rst
+++ /dev/null
@@ -1,212 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-macip
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-macip
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x710.rst
deleted file mode 100644
index f3f30407cb..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x710.rst
+++ /dev/null
@@ -1,166 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
index 0e89d5aebf..3ec9410e15 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
@@ -28,16 +28,49 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    10ge2p1xl710-eth-l2patch-ndrpdr
+    10ge2p1xl710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xl710-eth-l2xcbase-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base
--------------
+64b-1t1c-l2switching-base-scale-i40e
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr-lat}
+            \label{fig:/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +79,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-2t2c-l2switching-base-avf-ndr-lat}
+            \label{fig:/3n-hsw-xl710-64b-2t2c-l2switching-base-avf-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base
--------------
+64b-4t4c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +102,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-4t4c-l2switching-base-avf-ndr-lat}
+            \label{fig:/3n-hsw-xl710-64b-4t4c-l2switching-base-avf-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-x710.rst
index 6fce17f310..632c4c5799 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-x710.rst
@@ -28,85 +28,26 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    10ge2p1x710-avf-eth-l2patch-ndrpdr
+    10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features
------------------
+64b-2t1c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
+    <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-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -115,21 +56,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-nndr-latdr}
+            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-iacl
-----------------------
+64b-4t2c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +79,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-nndr-latdr}
+            \label{fig:3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-features-iacl
-----------------------
+64b-8t4c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,6 +102,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-nndr-latdr}
+            \label{fig:3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
index ea1780c99b..861808fce9 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
@@ -28,16 +28,183 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 64b-?t?c-l2switching-base-avf
+    10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    10ge2p1xxv710-eth-l2patch-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    ###  64b-?t?c-feature-l2switching-base-i40e
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base
--------------
+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-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat.html"></iframe>
+    <p><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-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat.html"></iframe>
+    <p><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-4t2c-l2switching-base-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-l2switching-base-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat.html"></iframe>
+    <p><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-8t4c-l2switching-base-avf-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +213,115 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base
--------------
+64b-4t2c-l2switching-base-scale-i40e
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-l2switching-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-l2switching-base-scale-i40e
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-l2switching-base-scale-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-feature-l2switching-base-i40e
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-feature-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+
+64b-4t2c-feature-l2switching-base-i40e
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-feature-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+
+64b-8t4c-feature-l2switching-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
+    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +330,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
index 642f995ccb..65b1983000 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -1,34 +1,8 @@
 
-
 .. 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>
-
 L2 Ethernet Switching
 =====================
 
@@ -39,14 +13,12 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1908>`_.
 
 .. toctree::
 
-    l2-3n-hsw-x520
-    l2-3n-hsw-x710
-    l2-3n-hsw-xl710
-    l2-3n-skx-x710
-    l2-3n-skx-xxv710
-    l2-2n-skx-x710
     l2-2n-skx-xxv710
+    l2-2n-skx-x710
+    l2-3n-skx-xxv710
+    l2-3n-skx-x710
+    l2-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-x520.rst
deleted file mode 100644
index 8629690d96..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
-            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
-            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-xl710.rst
similarity index 51%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-xl710.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-xl710.rst
index ee59560282..81e65d985e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-hsw-xl710.rst
@@ -28,16 +28,26 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    10ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_features
---------------------------
+78b-1t1c-srv6-ip6routing-base-i40e
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,41 +56,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_features-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]{memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
+78b-2t2c-srv6-ip6routing-base-i40e
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,18 +79,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+78b-4t4c-srv6-ip6routing-base-i40e
+----------------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +102,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..3a9fc2af95
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-skx-xxv710.rst
@@ -0,0 +1,107 @@
+
+.. 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-?t?c-srv6-ip6routing-base-i40e
+    10ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+78b-2t1c-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. 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-i40e-ndr-lat.html"></iframe>
+    <p><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-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-4t2c-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-srv6-ip6routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-8t4c-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-srv6-ip6routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-i40e-ndr-lat}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
index b5ff6bf401..89e7b1a37e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
@@ -13,8 +13,9 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1908>`_.
 
 .. toctree::
 
-    srv6-3n-hsw-x520
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst
deleted file mode 100644
index 87cac5bbed..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst
+++ /dev/null
@@ -1,166 +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-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
index 3bda735b6e..80a7b09b62 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
@@ -28,85 +28,24 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-vhost-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm45" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base-vm-l2sw
----------------------
+64b-2t1c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm46" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -115,21 +54,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-base_and_scale-ip4
----------------------------
+64b-4t2c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm47" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +77,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale-ip4
----------------------------
+64b-8t4c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm48" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,6 +100,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat}
+            \label{fig:2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst
deleted file mode 100644
index d9c5e18ac8..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst
+++ /dev/null
@@ -1,166 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst
deleted file mode 100644
index bbfb041c43..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst
+++ /dev/null
@@ -1,166 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-xl710.rst
index 98e2c796cb..3472603b22 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-xl710.rst
@@ -28,131 +28,24 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-vhost-base-i40e
+    10ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base-l2sw
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-l2sw
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-vm-l2sw
----------------------
+64b-1t1c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,21 +54,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-base_and_scale-ip4
----------------------------
+64b-2t2c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -184,21 +77,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale-ip4
----------------------------
+64b-4t4c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -207,6 +100,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
index 2c81bb19b2..0a0513738f 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
@@ -28,85 +28,26 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-vm-l2sw
-----------------------------------
+64b-2t1c-link-bonding-vhost-base-i40e
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -115,21 +56,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-base_and_scale-ip4
----------------------------
+64b-4t2c-link-bonding-vhost-base-i40e
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +79,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale-ip4
----------------------------
+64b-8t4c-link-bonding-vhost-base-i40e
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,6 +102,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..7c12fbd721
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-xxv710.rst
@@ -0,0 +1,183 @@
+
+.. 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-?t?c-vhost-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-vhost-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-vhost-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-vhost-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-link-bonding-vhost-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-4t2c-link-bonding-vhost-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-4t2c-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-8t4c-link-bonding-vhost-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <p><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-8t4c-link-bonding-vhost-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
index eff64690c0..b229eff2a4 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
@@ -14,14 +14,11 @@ a.k.a. VPP data plane thread(s), and their physical CPU core(s)
 placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1908>`_.
 
 .. toctree::
 
-    vm_vhost-3n-hsw-x520
-    vm_vhost-3n-hsw-x710
-    vm_vhost-3n-skx-x710
-    vm_vhost-2n-skx-x710
-
-..
     vm_vhost-2n-skx-xxv710
+    vm_vhost-3n-skx-xxv710
+    vm_vhost-3n-skx-x710
+    vm_vhost-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-x520.rst
deleted file mode 100644
index 846638546c..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-114b-1t1c
----------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-1t1c-ndr-lat}
-            \label{fig:vts-3n-hsw-x520-114b-1t1c-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-114b-2t2c
----------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-2t2c-ndr-lat}
-            \label{fig:vts-3n-hsw-x520-114b-2t2c-ndr-lat}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-xl710.rst
similarity index 51%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-dnv-x553.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-xl710.rst
index d2fefd7ae9..19769b3b8a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-dnv-x553.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-hsw-xl710.rst
@@ -28,18 +28,23 @@
 
     </script>
 
-.. _packet_throughput_graphs_ip6-2n-dnv-x553:
+..
+    ## 3n-hsw-xl710
+    ### 114b-?t?c-vts-l2switching-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 
-2n-dnv-x553
-~~~~~~~~~~~
+3n-hsw-xl710
+~~~~~~~~~~~~
 
-78b-1t1c-base
--------------
+114b-1t1c-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-1t1c-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -48,41 +53,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-dnv-x553-78b-1t1c-base-ndr}
-            \label{fig:ip6-2n-dnv-x553-78b-1t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-1t1c-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]{ip6-2n-dnv-x553-78b-1t1c-base-pdr}
-            \label{fig:ip6-2n-dnv-x553-78b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base
--------------
+114b-2t2c-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-2t2c-base-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -91,18 +76,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-dnv-x553-78b-2t2c-base-ndr}
-            \label{fig:ip6-2n-dnv-x553-78b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+114b-4t4c-vts-l2switching-base-i40e
+-----------------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-2t2c-base-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,6 +99,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-dnv-x553-78b-2t2c-base-pdr}
-            \label{fig:ip6-2n-dnv-x553-78b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-skx-xxv710.rst
similarity index 51%
rename from docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-skx-xxv710.rst
index 9633fd4a90..3f79c7574c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-skx-xxv710.rst
@@ -28,36 +28,23 @@
 
     </script>
 
-3n-hsw-x520
-~~~~~~~~~~~
+..
+    ## 3n-skx-xxv710
+    ### 64b-?t?c-vts-l2switching-base-i40e
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 
-78b-1t1c-base
--------------
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-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]{ip6tun-3n-hsw-x520-78b-1t1c-base-ndr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+114b-2t1c-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +53,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base-pdr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-base
--------------
+114b-4t2c-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,18 +76,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base-ndr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+114b-8t4c-vts-l2switching-base-i40e
+-----------------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +99,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base-pdr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
index 5a5a9a64d2..dc05549b0d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
@@ -3,8 +3,8 @@
 
     \clearpage
 
-VTS
-===
+Virtual Topology System
+=======================
 
 This section includes summary graphs of VPP Phy-to-VM(s)-to-Phy packet
 latency with with VM virtio and VPP vhost-user virtual interfaces
@@ -14,8 +14,9 @@ a.k.a. VPP data plane thread(s), and their physical CPU core(s)
 placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vts?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vts?h=rls1908>`_.
 
 .. toctree::
 
-    vts-3n-hsw-x520
+    vts-3n-skx-xxv710
+    vts-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst
deleted file mode 100644
index bdf4adba5e..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.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-x710
-~~~~~~~~~~~
-
-64b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_features-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]{memif-2n-skx-x710-64b-2t1c-base_and_features-ndr}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_features-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]{memif-2n-skx-x710-64b-2t1c-base_and_features-pdr}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_features-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]{memif-2n-skx-x710-64b-4t2c-base_and_features-ndr}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_features-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]{memif-2n-skx-x710-64b-4t2c-base_and_features-pdr}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_features-pdr}
-    \end{figure}
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
index 978c8d5b08..0bb3a5369c 100644
--- 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
@@ -28,59 +28,24 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-memif-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_features-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]{memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
-            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_features-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]{memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
-            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features
---------------------------
+64b-2t1c-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
-            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
-            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x520.rst
deleted file mode 100644
index f096bab5e8..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x520.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>
-
-3n-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_features-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]{memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_features-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]{memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_features-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]{memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_features-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]{memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x710.rst
deleted file mode 100644
index 9aa8c33eff..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-hsw-x710.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>
-
-3n-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_features-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]{memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_features-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]{memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_features-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]{memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_features-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]{memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-x710.rst
deleted file mode 100644
index 3fff1d7ca2..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-x710.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>
-
-3n-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_features-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]{memif-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_features-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]{memif-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_features-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]{memif-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_features-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]{memif-3n-skx-x710-64b-4t2c-base_and_features-pdr}
-            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..691a25be1e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst
@@ -0,0 +1,86 @@
+
+.. 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-?t?c-memif-base-i40e
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+
+Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-memif-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-i40e-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-memif-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-i40e-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-memif-base-i40e-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-memif-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-i40e-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 a7acf3f4ab..9e770ccbc5 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
@@ -13,15 +13,9 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1908>`_.
 
 .. toctree::
 
-    container_memif-3n-hsw-x520
-    container_memif-3n-hsw-x710
-    container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
-    container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
+    container_memif-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x520.rst
deleted file mode 100644
index 8513fa35f4..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x710.rst
deleted file mode 100644
index b1e9064c93..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2xc
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2bd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated.rst
deleted file mode 100644
index 04888e71b6..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-K8s Container Memif
-===================
-
-Following sections include summary graphs of VPP Phy-to-Phy performance
-with Container Orchestrated Topologies, including NDR throughput (zero packet
-loss) and PDR throughput (<0.5% packet loss). Performance is reported for VPP
-running in multiple configurations of VPP worker thread(s), a.k.a. VPP
-data plane thread(s), and their physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1901>`_.
-
-.. toctree::
-
-    container_orchestrated-3n-hsw-x520
-    container_orchestrated-3n-hsw-x710
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 48f66d1b78..d5bc33bf3e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -62,11 +62,7 @@ Additional information about graph data:
     ip6
     srv6
     ip4_tunnels
-    ip6_tunnels
     vm_vhost
     container_memif
     ipsec
     vts
-
-..
-    container_orchestrated
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
index 3070cff985..c6970d1702 100644
--- 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
@@ -28,145 +28,31 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ###  64b-?t?c-ip4routing-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm65" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-base_and_scale-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]{ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm66" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-base_and_scale-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]{ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm67" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-base_and_scale-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]{ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm68" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-base_and_scale-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]{ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-features-iacl-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]{ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-features-iacl-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]{ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-iacl
------------------------
+64b-2t1c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr.html"></iframe>
+    <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-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
+            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr.html"></iframe>
+    <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-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr}
+            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-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
index 69cee95e77..4923ca7459 100644
--- 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
@@ -28,16 +28,101 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-ip4routing-base-scale-avf
+    2n1l-10ge2p1xxv710-avf-dot1q-ip4base-ndrpdr - missing
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-features-ip4routing-base-i40e
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+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-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm69" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +131,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +142,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm70" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +151,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-2t1c-features-ip4routing-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm71" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +174,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +185,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm72" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +194,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x520.rst
deleted file mode 100644
index 67c06d4484..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x520.rst
+++ /dev/null
@@ -1,458 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-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]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-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]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-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]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-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]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-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]{ip4-3n-hsw-x520-64b-1t1c-features-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-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]{ip4-3n-hsw-x520-64b-1t1c-features-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-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]{ip4-3n-hsw-x520-64b-2t2c-features-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-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]{ip4-3n-hsw-x520-64b-2t2c-features-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-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]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-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]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-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]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-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]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-nat44}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-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]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-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]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-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]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-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]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-iacl}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-oacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-oacl-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]{ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-oacl-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]{ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-oacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-oacl-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]{ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-oacl-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]{ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-oacl}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x710.rst
deleted file mode 100644
index db4667bdae..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x710.rst
+++ /dev/null
@@ -1,372 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-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]{ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-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]{ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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]{ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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]{ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-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]{ip4-3n-hsw-x710-64b-1t1c-features-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-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]{ip4-3n-hsw-x710-64b-1t1c-features-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-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]{ip4-3n-hsw-x710-64b-2t2c-features-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-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]{ip4-3n-hsw-x710-64b-2t2c-features-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-nat44-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]{ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-nat44-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]{ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-nat44-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]{ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-nat44-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]{ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-features-nat44}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-iacl-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]{ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-iacl-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]{ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-iacl-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]{ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-iacl-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]{ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-features-iacl}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
index 3372ba3f6a..8f98984710 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
@@ -28,59 +28,27 @@
 
     </script>
 
-3n-hsw-xl710
-~~~~~~~~~~~~
-
-64b-1t1c-base
--------------
-
-.. raw:: html
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4scale2m-ndrpdr
 
-    <center>
-    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-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]{ip4-3n-hsw-xl710-64b-1t1c-base-ndr}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+    Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-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]{ip4-3n-hsw-xl710-64b-1t1c-base-pdr}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+3n-hsw-xl710
+~~~~~~~~~~~~
 
-64b-2t2c-base
--------------
+64b-1t1c-ip4routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +57,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base-ndr}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +77,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base-pdr}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-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
index 67cc5838b3..b59f9beac5 100644
--- 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
@@ -28,16 +28,31 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-?t?c-ip4routing-base-scale-avf-i40e
+    10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    10ge2p1x710-dot1q-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
+    Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm45" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr.html"></iframe>
+    <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-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm46" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr.html"></iframe>
+    <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-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,304 +84,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
             \label{fig:ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm47" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-base_and_scale-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]{ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm48" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-base_and_scale-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]{ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm49" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-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]{ip4-3n-skx-x710-64b-2t1c-features-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm50" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-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]{ip4-3n-skx-x710-64b-2t1c-features-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm51" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-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]{ip4-3n-skx-x710-64b-4t2c-features-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm52" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-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]{ip4-3n-skx-x710-64b-4t2c-features-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm53" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-nat44-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]{ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm54" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-nat44-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]{ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-nat44
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm55" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-nat44-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]{ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm56" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-nat44-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]{ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-features-nat44}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm57" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-iacl-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]{ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm58" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-iacl-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]{ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm59" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-iacl-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]{ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm60" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-iacl-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]{ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-features-iacl}
-    \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
new file mode 100644
index 0000000000..6a8f6dd031
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
@@ -0,0 +1,198 @@
+
+.. 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-?t?c-ip4routing-base-scale-avf
+    10ge2p1xxv710-avf-eth-ip4base-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-ip4routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-?t?c-feature-ip4routing-base-i40e
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr
+
+3n-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/3n-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]{3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr}
+            \label{fig:3n-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/3n-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]{3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-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-scale-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-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/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-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-scale-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-feature-ip4routing-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-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-feature-ip4routing-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-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/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-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-feature-ip4routing-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-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 205d2a696f..4a272d8085 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -13,16 +13,12 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1908>`_.
 
 .. toctree::
 
-    ip4-3n-hsw-x520
-    ip4-3n-hsw-x710
-    ip4-3n-hsw-xl710
-    ip4-3n-skx-x710
-    ip4-2n-skx-x710
     ip4-2n-skx-xxv710
-
-..
-    ip4-2n-dnv-x553
+    ip4-2n-skx-x710
+    ip4-3n-skx-xxv710
+    ip4-3n-skx-x710
+    ip4-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index ef7da43470..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x520.rst
+++ /dev/null
@@ -1,201 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-hsw-x520
-~~~~~~~~~~~
-
-..
-    64b-1t1c-base_and_scale
-    -----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-                \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-                \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-2t2c-base_and_scale
-    -----------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-                \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-                \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-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]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-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]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-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]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-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]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x710.rst
deleted file mode 100644
index dc9964ade5..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-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]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-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]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-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]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-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]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
similarity index 58%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst
rename to docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
index bc6c75f64b..3c2f05ee93 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-ip4tunnel-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+
+    Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_features
---------------------------
+64b-1t1c-ip4tunnel-base-i40e
+----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +55,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_features
---------------------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-x710.rst
deleted file mode 100644
index d65ca70c20..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-x710.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-x710
-~~~~~~~~~~~
-
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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]{ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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]{ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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]{ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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]{ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-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]{ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-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]{ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-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]{ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-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]{ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_features-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
new file mode 100644
index 0000000000..325c7cd78b
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
@@ -0,0 +1,83 @@
+
+.. 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-?t?c-ip4tunnel-base-scale-i40e
+    10ge2p1xxv710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+
+    Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+    Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-ip4tunnel-base-scale-i40e
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-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-scale-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-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-ip4tunnel-base-scale-i40e-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-scale-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-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 670d580fa0..ba03163367 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
@@ -13,10 +13,9 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1908>`_.
 
 .. toctree::
 
-    ip4_tunnels-3n-hsw-x520
-    ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710
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
index df06c7a64a..e47c1b71e5 100644
--- 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
@@ -28,59 +28,26 @@
 
     </script>
 
-2n-skx-x710
-~~~~~~~~~~~
-
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
+..
+    ## 2n-skx-x710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-base_and_scale-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]{ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr}
-            \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-base_and_scale-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]{ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr}
-            \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+2n-skx-x710
+~~~~~~~~~~~
 
-78b-4t2c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr}
-            \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr}
-            \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-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
index 30d76b7760..566ada568a 100644
--- 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
@@ -28,59 +28,31 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-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]{ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr}
-            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-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]{ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr}
-            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-4t2c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr}
-            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr}
-            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x710.rst
deleted file mode 100644
index fa723db303..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-78b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-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]{ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-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]{ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-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]{ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-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]{ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_features-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]{ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_features-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]{ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_features-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]{ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_features-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]{ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
index a86321d84a..ae21b1ac7a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
@@ -28,16 +28,27 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-1t1c-base
--------------
+78b-1t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,46 +80,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
             \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-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]{ip6-3n-hsw-xl710-78b-2t2c-base-ndr}
-            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-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]{ip6-3n-hsw-xl710-78b-2t2c-base-pdr}
-            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base-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
index 023262beeb..ddcb96858f 100644
--- 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
@@ -28,145 +28,26 @@
 
     </script>
 
-3n-skx-x710
-~~~~~~~~~~~
-
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_scale-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]{ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_scale-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]{ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-4t2c-base_and_scale
------------------------
+..
+    ## 3n-skx-x710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1x710-ethip6-ip6base-ndrpdr
+    10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_scale-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]{ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+    Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_scale-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]{ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_features-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]{ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_features-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]{ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
+3n-skx-x710
+~~~~~~~~~~~
 
-78b-4t2c-base_and_features
---------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-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
index c4c41f43ae..6606da507e 100644
--- 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
@@ -28,59 +28,31 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 78b-?t?c-ip6routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
+    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr
+    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr
+    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr
+    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-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]{ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-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]{ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-4t2c-base_and_scale
------------------------
+78b-2t1c-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-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 50e9cdcddd..adc5fd328d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -13,17 +13,12 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1908>`_.
 
 .. toctree::
 
-    ip6-3n-hsw-x520
-    ip6-3n-hsw-x710
-    ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
-    ip6-2n-skx-x710
     ip6-2n-skx-xxv710
-
-..
-    ip6-2n-dnv-x553
+    ip6-2n-skx-x710
+    ip6-3n-skx-xxv710
+    ip6-3n-skx-x710
+    ip6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
deleted file mode 100644
index fec3fe3ee9..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-IPv6 Tunnels
-============
-
-Following sections include summary graphs of VPP Phy-to-Phy performance
-with IPv6 Overlay Tunnels, including NDR throughput (zero packet loss)
-and PDR throughput (<0.5% packet loss). Performance is reported for VPP
-running in multiple configurations of VPP worker thread(s), a.k.a. VPP
-data plane thread(s), and their physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1901>`_.
-
-.. toctree::
-
-    ip6_tunnels-3n-hsw-x520
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
index 77bc77c8d7..f2e0408cab 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
@@ -28,188 +28,44 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+    ### imix-?t?c-ipsec-ip4routing-base-scale-hw-i40e
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr - missing
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr - missing
+
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-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]{ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-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]{ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-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]{ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-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]{ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-scale
---------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-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]{ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-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]{ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-scale
---------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-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]{ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-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]{ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-sw
------------
+imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -218,8 +74,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -229,7 +85,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -238,21 +94,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-sw
------------
+imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -261,8 +117,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -272,7 +128,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -281,6 +137,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr}
     \end{figure}
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
new file mode 100644
index 0000000000..ac381ca6fa
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
@@ -0,0 +1,88 @@
+
+.. 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-?t?c-ipsec-ip4routing-base-scale-i40e
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+imix-2t1c-ipsec-ip4routing-base-scale-i40e
+------------------------------------------
+
+.. 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-i40e-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-i40e-ndr}
+            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-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-i40e-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-i40e-pdr}
+            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-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 c09be78a0b..54ef8a002e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -3,31 +3,6 @@
 
     \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 IPv4 Routing
 ==================
 
@@ -41,8 +16,9 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1908>`_.
 
 .. toctree::
 
+    ipsec-3n-skx-xxv710
     ipsec-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst
deleted file mode 100644
index d3361aa668..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-dnv-x553.rst
+++ /dev/null
@@ -1,116 +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>
-
-.. _packet_throughput_graphs_l2sw-2n-dnv-x553:
-
-2n-dnv-x553
-~~~~~~~~~~~
-
-64b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-1t1c-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]{l2sw-2n-dnv-x553-64b-1t1c-base-ndr}
-            \label{fig:l2sw-2n-dnv-x553-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-1t1c-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]{l2sw-2n-dnv-x553-64b-1t1c-base-pdr}
-            \label{fig:l2sw-2n-dnv-x553-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-2t2c-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]{l2sw-2n-dnv-x553-64b-2t2c-base-ndr}
-            \label{fig:l2sw-2n-dnv-x553-64b-2t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-2t2c-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]{l2sw-2n-dnv-x553-64b-2t2c-base-pdr}
-            \label{fig:l2sw-2n-dnv-x553-64b-2t2c-base-pdr}
-    \end{figure}
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
index 5fefc7928c..b53c3d82cf 100644
--- 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
@@ -28,59 +28,33 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-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]{l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-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]{l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
+64b-2t1c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr.html"></iframe>
+    <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-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +63,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
+            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +74,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr.html"></iframe>
+    <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-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +83,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
+            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-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
index 3d0384ffd5..b6470d0dac 100644
--- 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
@@ -28,16 +28,97 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-l2switching-base-avf
+    2n1l-10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr - missing
+
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+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-i40e
+------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +127,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +138,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +147,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-2t1c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +170,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +181,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +190,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x520.rst
deleted file mode 100644
index 23970621c3..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x520.rst
+++ /dev/null
@@ -1,372 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-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]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-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]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-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]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-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]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-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]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-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]{l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-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]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-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]{l2sw-3n-hsw-x520-64b-2t2c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-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]{l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-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]{l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-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]{l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-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]{l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features-iacl}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-macip
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-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]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-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]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-macip
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-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]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-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]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features-macip}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x710.rst
deleted file mode 100644
index 583714101f..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x710.rst
+++ /dev/null
@@ -1,286 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-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]{l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-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]{l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-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]{l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-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]{l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-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]{l2sw-3n-hsw-x710-64b-1t1c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-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]{l2sw-3n-hsw-x710-64b-1t1c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-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]{l2sw-3n-hsw-x710-64b-2t2c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-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]{l2sw-3n-hsw-x710-64b-2t2c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-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]{l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-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]{l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-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]{l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-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]{l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-features-iacl}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
index 1eb4877138..f4c6b72d16 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
@@ -28,59 +28,33 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    10ge2p1xl710-eth-l2patch-ndrpdr
+    10ge2p1xl710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xl710-eth-l2xcbase-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-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]{l2sw-3n-hsw-xl710-64b-1t1c-base-ndr}
-            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-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]{l2sw-3n-hsw-xl710-64b-1t1c-base-pdr}
-            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale
------------------------
+64b-1t1c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +63,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base-ndr}
-            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
+            \label{fig:/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +74,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +83,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base-pdr}
-            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-pdr}
+            \label{fig:/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-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
index 23bb90e724..1028a1a6df 100644
--- 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
@@ -28,231 +28,32 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    10ge2p1x710-avf-eth-l2patch-ndrpdr - missing
+    10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-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]{l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-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]{l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-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]{l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-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]{l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-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]{l2sw-3n-skx-x710-64b-2t1c-features-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-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]{l2sw-3n-skx-x710-64b-2t1c-features-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-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]{l2sw-3n-skx-x710-64b-4t2c-features-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-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]{l2sw-3n-skx-x710-64b-4t2c-features-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-features}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-features-iacl
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-iacl-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]{l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-iacl-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]{l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-features-iacl
-----------------------
+64b-2t1c-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr.html"></iframe>
+    <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-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -261,8 +62,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
+            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -272,7 +73,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr.html"></iframe>
+    <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-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -281,6 +82,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-features-iacl}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
+            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-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
index 38849da955..be9e4a81e1 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
@@ -28,16 +28,154 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 64b-?t?c-l2switching-base-avf
+    10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-?t?c-l2switching-base-scale-i40e
+    10ge2p1xxv710-eth-l2patch-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
+
+    ###  64b-?t?c-feature-l2switching-base-i40e
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+    Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base
--------------
+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-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]{3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr}
+            \label{fig:3n-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/3n-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]{3n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-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-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-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/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-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-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +184,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base-ndr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +195,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +204,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base-pdr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base
--------------
+64b-2t1c-feature-l2switching-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +227,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base-ndr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +238,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +247,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base-pdr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-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 fe09661811..04589220bc 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -3,31 +3,6 @@
 
     \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>
-
 L2 Ethernet Switching
 =====================
 
@@ -38,17 +13,12 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1908>`_.
 
 .. toctree::
 
-    l2-3n-hsw-x520
-    l2-3n-hsw-x710
-    l2-3n-hsw-xl710
-    l2-3n-skx-x710
-    l2-3n-skx-xxv710
-    l2-2n-skx-x710
     l2-2n-skx-xxv710
-
-..
-    l2-2n-dnv-x553
+    l2-2n-skx-x710
+    l2-3n-skx-xxv710
+    l2-3n-skx-x710
+    l2-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-x520.rst
deleted file mode 100644
index feba2b0437..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-x520.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>
-
-3n-hsw-x520
-~~~~~~~~~~~
-
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-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]{srv6-3n-hsw-x520-78b-1t1c-features-ndr}
-            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-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]{srv6-3n-hsw-x520-78b-1t1c-features-pdr}
-            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-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]{srv6-3n-hsw-x520-78b-2t2c-features-ndr}
-            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-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]{srv6-3n-hsw-x520-78b-2t2c-features-pdr}
-            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..7931b7cfde
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst
@@ -0,0 +1,88 @@
+
+.. 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-hsw-xl710
+    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    10ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+78b-1t1c-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
+    \end{figure}
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
new file mode 100644
index 0000000000..7c5973995e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
@@ -0,0 +1,88 @@
+
+.. 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-?t?c-srv6-ip6routing-base-i40e
+    10ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+78b-2t1c-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. 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-i40e-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-i40e-ndr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-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-i40e-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-i40e-pdr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-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 488ba7fd0e..0a55addf46 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -3,31 +3,6 @@
 
     \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>
-
 SRv6 Routing
 ============
 
@@ -38,8 +13,9 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1908>`_.
 
 .. toctree::
 
-    srv6-3n-hsw-x520
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst
deleted file mode 100644
index b4d71f8201..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst
+++ /dev/null
@@ -1,286 +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-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm65" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm66" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm67" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm68" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm73" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm74" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm75" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm76" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm77" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm78" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm79" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm80" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
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
index 8b41fb8476..11e63c1b35 100644
--- 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
@@ -28,231 +28,29 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-?t?c-vhost-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm81" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm82" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm83" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm84" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm89" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-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]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm90" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-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]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm91" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-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]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm92" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-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]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm93" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-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]{vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm94" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-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]{vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-ip4
----------------------------
+64b-2t1c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm95" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -261,8 +59,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -272,7 +70,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm96" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -281,6 +79,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst
deleted file mode 100644
index 205386d6d0..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst
+++ /dev/null
@@ -1,286 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst
deleted file mode 100644
index 9965edf3e5..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst
+++ /dev/null
@@ -1,286 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-1t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
index c772227f15..e5988b6dc3 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
@@ -28,317 +28,29 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-?t?c-vhost-base-i40e
+    10ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+    Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base-l2sw
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-l2sw
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base-vm-l2sw
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm45" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm46" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-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]{vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-ip4
----------------------------
+64b-1t1c-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm47" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -347,8 +59,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -358,7 +70,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm48" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -367,6 +79,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
index 7b4e72d3df..375f5ae6dc 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
@@ -28,231 +28,26 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    #### 64b-?t?c-link-bonding-vhost-base-i40e - missing
+    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr - missing
+    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr - missing
+    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr - missing
+    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr - missing
+    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr - missing
+    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr - missing
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm49" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm50" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-l2sw
--------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm51" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm52" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm57" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm58" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_features-vm-l2sw
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm59" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm60" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-base_and_scale-ip4
----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm61" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-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]{vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm62" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-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]{vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-ip4
----------------------------
+64b-2t1c-link-bonding-vhost-base-i40e
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm63" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -261,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -272,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm64" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -281,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..cdfd4d634a
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst
@@ -0,0 +1,144 @@
+
+.. 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-?t?c-vhost-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-vhost-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-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-vhost-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-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-vhost-base-i40e-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-vhost-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-link-bonding-vhost-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-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-link-bonding-vhost-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-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/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-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-link-bonding-vhost-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-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 6cae714171..7334df8917 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
@@ -16,14 +16,11 @@ configurations of VPP worker thread(s), a.k.a. VPP data plane thread(s),
 and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1908>`_.
 
 .. toctree::
 
-    vm_vhost-3n-hsw-x520
-    vm_vhost-3n-hsw-x710
-    vm_vhost-3n-skx-x710
-    vm_vhost-2n-skx-x710
-
-..
     vm_vhost-2n-skx-xxv710
+    vm_vhost-3n-skx-xxv710
+    vm_vhost-3n-skx-x710
+    vm_vhost-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..c4b54f544d
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-hsw-xl710.rst
@@ -0,0 +1,82 @@
+
+.. 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-hsw-xl710
+    ### 114b-?t?c-vts-l2switching-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+
+    Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.tc01-114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.tc01-114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+114b-1t1c-vts-l2switching-base-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-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-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr}
+            \label{fig:3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-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-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-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-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-pdr}
+            \label{fig:3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..6e5659f118
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-skx-xxv710.rst
@@ -0,0 +1,82 @@
+
+.. 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-?t?c-vts-l2switching-base-i40e
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+
+    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+114b-2t1c-vts-l2switching-base-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-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-114b-2t1c-vts-l2switching-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-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-114b-2t1c-vts-l2switching-base-i40e-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-114b-2t1c-vts-l2switching-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
index 027a9394ec..ac701387ce 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
@@ -3,8 +3,8 @@
 
     \clearpage
 
-VTS
-===
+Virtual Topology System
+=======================
 
 Following sections include summary graphs of VPP Phy-to-VM(s)-to-Phy
 performance with VM virtio and VPP vhost-user virtual interfaces,
@@ -14,8 +14,9 @@ configurations of VPP worker thread(s), a.k.a. VPP data plane thread(s),
 and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vts?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vts?h=rls1908>`_.
 
 .. toctree::
 
-    vts-3n-hsw-x520
+    vts-3n-skx-xxv710
+    vts-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst
deleted file mode 100644
index 411c8a5583..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-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-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_features-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]{memif-2n-skx-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_features-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]{memif-2n-skx-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base_and_features-pdr-tsa}
-    \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
index 3a3a80d042..865ed78e25 100644
--- 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
@@ -28,16 +28,24 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-memif-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_features
----------------------
+64b-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst
deleted file mode 100644
index 5299650bf8..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-64b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_features-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]{memif-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_features-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]{memif-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst
deleted file mode 100644
index 0d33410208..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-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-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_features-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]{memif-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_features-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]{memif-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst
deleted file mode 100644
index 2bf2da736f..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-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-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_features-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]{memif-3n-skx-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-3n-skx-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_features-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]{memif-3n-skx-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-3n-skx-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
similarity index 59%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
index 3c30b62bc6..8d079aa50e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
@@ -28,16 +28,25 @@
 
     </script>
 
-2n-skx-x710
-~~~~~~~~~~~
+..
+    ## 3n-skx-xxv710
+    ### 64b-memif-base-i40e
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 
-64b-2t1c-base_and_features
---------------------------
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-memif-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +55,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_features
---------------------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-memif-base-i40e-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 2713cc65d3..4a4ea954e5 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
@@ -15,15 +15,9 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1908>`_.
 
 .. toctree::
 
-    container_memif-3n-hsw-x520
-    container_memif-3n-hsw-x710
-    container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
-    container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
+    container_memif-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x520.rst
deleted file mode 100644
index 4d09e3d906..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x520.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>
-
-3n-hsw-x520
-~~~~~~~~~~~
-
-64b-base_and_scale-l2xc
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-l2bd
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x710.rst
deleted file mode 100644
index 6e015c076c..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated-3n-hsw-x710.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>
-
-3n-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_scale-l2xc
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-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]{k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-l2bd
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-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]{k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst
deleted file mode 100644
index dd023ddceb..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-K8s Container Memif
-===================
-
-Following sections include Throughput Speedup Analysis for VPP multi-
-core multi-thread configurations with no Hyper-Threading, specifically
-for tested 2t2c (2threads, 2cores) and 4t4c scenarios. 1t1c throughput
-results are used as a reference for reported speedup ratio.
-Performance is reported for VPP
-running in multiple configurations of VPP worker thread(s), a.k.a. VPP
-data plane thread(s), and their physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1901>`_.
-
-.. toctree::
-
-    container_orchestrated-3n-hsw-x520
-    container_orchestrated-3n-hsw-x710
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 f31bfe6012..30a16dad93 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
@@ -52,11 +52,7 @@ Additional information about graph data:
     ip6
     srv6
     ip4_tunnels
-    ip6_tunnels
     vm_vhost
     container_memif
     ipsec
     vts
-
-..
-    container_orchestrated
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-dnv-x553.rst
deleted file mode 100644
index 702de5f890..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-dnv-x553.rst
+++ /dev/null
@@ -1,73 +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>
-
-.. _speedup_graphs_ip4-2n-dnv-x553:
-
-2n-dnv-x553
-~~~~~~~~~~~
-
-64b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-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]{ip4-2n-dnv-x553-64b-base-ndr-tsa}
-            \label{fig:ip4-2n-dnv-x553-64b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-dnv-x553-64b-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]{ip4-2n-dnv-x553-64b-base-pdr-tsa}
-            \label{fig:ip4-2n-dnv-x553-64b-base-pdr-tsa}
-    \end{figure}
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
index 9f331c12fb..085b73236c 100644
--- 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
@@ -28,59 +28,25 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ###  64b-ip4routing-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-base_and_scale-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]{ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-base_and_scale-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]{ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
+64b-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-features-iacl-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-features-iacl-ndr-tsa}
-            \label{fig:ip4-2n-skx-x710-64b-features-iacl-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
+            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-features-iacl-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,10 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-features-iacl-pdr-tsa}
-            \label{fig:ip4-2n-skx-x710-64b-features-iacl-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
+            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
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
index 817a28abcd..33d7a28570 100644
--- 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
@@ -28,16 +28,126 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-ip4routing-base-scale-avf
+    2n1l-10ge2p1xxv710-avf-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-ip4routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-features-ip4routing-base-i40e
+    2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+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-i40e
+-----------------------------------
+
+.. 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-i40e-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-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-i40e-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-i40e-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-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-features-ip4routing-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +156,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +167,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +176,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x520.rst
deleted file mode 100644
index 9e708fee85..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x520.rst
+++ /dev/null
@@ -1,243 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-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]{ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-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]{ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-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]{ip4-3n-hsw-x520-64b-features-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-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]{ip4-3n-hsw-x520-64b-features-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-nat44
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-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]{ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-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]{ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-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]{ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-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]{ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-oacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-oacl-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]{ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-oacl-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]{ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x710.rst
deleted file mode 100644
index 04a71ef4d7..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x710.rst
+++ /dev/null
@@ -1,244 +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-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-base_and_scale-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]{ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-base_and_scale-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]{ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-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]{ip4-3n-hsw-x710-64b-features-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-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]{ip4-3n-hsw-x710-64b-features-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-nat44
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-nat44-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]{ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-nat44-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]{ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-iacl-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]{ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-iacl-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]{ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa}
-    \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-features-oacl
-    -----------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-oacl-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]{ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa}
-                \label{fig:ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-oacl-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]{ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa}
-                \label{fig:ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
index 7bc2ecd8db..93e59ba4ba 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-ip4routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-ndrpdr
+    10ge2p1xl710-ethip4-ip4scale2m-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base
---------
+64b-ip4routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-base-ndr-tsa}
-            \label{fig:ip4-3n-hsw-xl710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-base-pdr-tsa}
-            \label{fig:ip4-3n-hsw-xl710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-i40e-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
index 7fe107482c..f622d00983 100644
--- 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
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-ip4routing-base-scale-avf-i40e
+    10ge2p1x710-avf-ethip4-ip4base-ndrpdr
+    10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
+    10ge2p1x710-dot1q-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4base-ndrpdr
+    10ge2p1x710-ethip4-ip4scale2m-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-ip4routing-base-scale-avf-i40e
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,132 +78,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa}
             \label{fig:ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-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]{ip4-3n-skx-x710-64b-features-ndr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-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]{ip4-3n-skx-x710-64b-features-pdr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-nat44
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-nat44-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]{ip4-3n-skx-x710-64b-features-nat44-ndr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-nat44-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-nat44-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]{ip4-3n-skx-x710-64b-features-nat44-pdr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-nat44-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-iacl-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]{ip4-3n-skx-x710-64b-features-iacl-ndr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-iacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-features-iacl-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]{ip4-3n-skx-x710-64b-features-iacl-pdr-tsa}
-            \label{fig:ip4-3n-skx-x710-64b-features-iacl-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
new file mode 100644
index 0000000000..e513173980
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
@@ -0,0 +1,180 @@
+
+.. 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-scale-avf
+    10ge2p1xxv710-avf-eth-ip4base-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-ip4routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
+    10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
+
+    ### 64b-feature-ip4routing-base-i40e
+    10ge2p1xxv710-ethip4-ip4base-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-ethip4udp-ip4base-nat44-ndrpdr
+
+3n-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/3n-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]{3n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa}
+            \label{fig:3n-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/3n-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]{3n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale-i40e
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-ip4routing-base-scale-i40e-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-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-i40e-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/3n-skx-xxv710-64b-ip4routing-base-scale-i40e-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-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-feature-ip4routing-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-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-feature-ip4routing-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-feature-ip4routing-base-i40e-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/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-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-feature-ip4routing-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-feature-ip4routing-base-i40e-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 439ed71295..8c81ed2557 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
@@ -15,16 +15,12 @@ IPv4 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/vpp/perf/ip4?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1908>`_.
 
 .. toctree::
 
-    ip4-3n-hsw-x520
-    ip4-3n-hsw-x710
-    ip4-3n-hsw-xl710
-    ip4-3n-skx-x710
-    ip4-2n-skx-x710
     ip4-2n-skx-xxv710
-
-..
-    ip4-2n-dnv-x553
+    ip4-2n-skx-x710
+    ip4-3n-skx-xxv710
+    ip4-3n-skx-x710
+    ip4-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index 9c7c6ec220..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x520.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>
-
-3n-hsw-x520
-~~~~~~~~~~~
-
-..
-    64b-base_and_scale
-    ------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-                \label{fig:ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_scale-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]{ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-                \label{fig:ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-64b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_features-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]{ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-            \label{fig:ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_features-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]{ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-            \label{fig:ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x710.rst
deleted file mode 100644
index 7b2ce329db..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-x710.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>
-
-3n-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_scale-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]{ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_features-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]{ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_features-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]{ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
similarity index 64%
rename from docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
index 44d73e4de0..12dbf5def4 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
@@ -28,16 +28,22 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-ip4tunnel-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base_and_features
----------------------
+64b-ip4tunnel-base-i40e
+----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa}
-            \label{fig:memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa}
-            \label{fig:memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-x710.rst
deleted file mode 100644
index 1f646ff4d0..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-x710.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>
-
-3n-skx-x710
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-base_and_scale-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]{ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-base_and_scale-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]{ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-base_and_features-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]{ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-base_and_features-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]{ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
similarity index 58%
rename from docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-x520.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
index 8e6942220c..7dd8082105 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
@@ -27,17 +27,24 @@
         }
 
     </script>
+..
+    ## 3n-skx-xxv710
+    ### 64b-ip4tunnel-base-scale-i40e
+    10ge2p1xxv710-ethip4vxlan-l2xcbase-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+    10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 
-3n-hsw-x520
-~~~~~~~~~~~
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-114b-base_and_scale
--------------------
+64b-ip4tunnel-base-scale-i40e
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa}
-            \label{fig:vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa}
-            \label{fig:vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-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 574112c7ac..c995cfc2e3 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
@@ -15,10 +15,9 @@ running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1908>`_.
 
 .. toctree::
 
-    ip4_tunnels-3n-hsw-x520
-    ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
+    ip4_tunnels-3n-skx-xxv710
+    ip4_tunnels-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-dnv-x553.rst
deleted file mode 100644
index 92a4b0fa8f..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-dnv-x553.rst
+++ /dev/null
@@ -1,73 +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>
-
-.. _speedup_graphs_ip6-2n-dnv-x553:
-
-2n-dnv-x553
-~~~~~~~~~~~
-
-78b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-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]{ip6-2n-dnv-x553-78b-base-ndr-tsa}
-            \label{fig:ip6-2n-dnv-x553-78b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-dnv-x553-78b-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]{ip6-2n-dnv-x553-78b-base-pdr-tsa}
-            \label{fig:ip6-2n-dnv-x553-78b-base-pdr-tsa}
-    \end{figure}
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
index a9b4254831..923e8ab5b4 100644
--- 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
@@ -28,16 +28,22 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ### 78b-ip6routing-base-scale-i40e
+    2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-i40e-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
index 5a6925103b..4564020b5b 100644
--- 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
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 78b-ip6routing-base-scale-i40e
+    2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    2n1l-10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst
deleted file mode 100644
index 331a6ac886..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst
+++ /dev/null
@@ -1,75 +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-hsw-x520
-~~~~~~~~~~~
-
-78b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-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]{ip6-3n-hsw-x520-78b-base-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-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]{ip6-3n-hsw-x520-78b-base-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x710.rst
deleted file mode 100644
index bf3eae6b47..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x710.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>
-
-3n-hsw-x710
-~~~~~~~~~~~
-
-78b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_scale-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]{ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_scale-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]{ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_features-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]{ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_features-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]{ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
index 592ea51104..38300ff931 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 78b-ip6routing-base-scale-i40e
+    10ge2p1xl710-dot1q-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6base-ndrpdr
+    10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-base
---------
+78b-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-base-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-base-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
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
index 5a2c7d2c18..723c03d421 100644
--- 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
@@ -28,59 +28,22 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 78b-ip6routing-base-scale-i40e
+    10ge2p1x710-ethip6-ip6base-ndrpdr
+    10ge2p1x710-ethip6-ip6scale2m-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_scale-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]{ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_scale-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]{ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-base_and_features
----------------------
+78b-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-base_and_features-ndr-tsa}
-            \label{fig:ip6-3n-skx-x710-78b-base_and_features-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-base_and_features-pdr-tsa}
-            \label{fig:ip6-3n-skx-x710-78b-base_and_features-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-i40e-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
index d293e9754a..2df53029aa 100644
--- 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
@@ -28,16 +28,25 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 78b-ip6routing-base-scale-i40e
+    10ge2p1xxv710-dot1q-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6base-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale200k-ndrpdr
+    10ge2p1xxv710-ethip6-ip6scale2m-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-ip6routing-base-scale-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-i40e-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 23889ed2be..67f5f49ea6 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
@@ -15,17 +15,12 @@ IPv6 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/vpp/perf/ip6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1908>`_.
 
 .. toctree::
 
-    ip6-3n-hsw-x520
-    ip6-3n-hsw-x710
-    ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
-    ip6-2n-skx-x710
     ip6-2n-skx-xxv710
-
-..
-    ip6-2n-dnv-x553
+    ip6-2n-skx-x710
+    ip6-3n-skx-xxv710
+    ip6-3n-skx-x710
+    ip6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst
deleted file mode 100644
index 4b5823e187..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-78b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-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]{ip6tun-3n-hsw-x520-78b-base-ndr-tsa}
-            \label{fig:ip6tun-3n-hsw-x520-78b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-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]{ip6tun-3n-hsw-x520-78b-base-pdr-tsa}
-            \label{fig:ip6tun-3n-hsw-x520-78b-base-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
deleted file mode 100644
index 7750327977..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-IPv6 Tunnels
-============
-
-Following sections include Throughput Speedup Analysis for VPP multi-
-core multi-thread configurations with no Hyper-Threading, specifically
-for tested 2t2c (2threads, 2cores) and 4t4c scenarios. 1t1c throughput
-results are used as a reference for reported speedup ratio.
-Performance is reported for VPP
-running in multiple configurations of VPP worker thread(s), a.k.a. VPP
-data plane thread(s), and their physical CPU core(s) placement.
-
-CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1901>`_.
-
-.. toctree::
-
-    ip6_tunnels-3n-hsw-x520
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
index cd454bf81e..3b20e97dfd 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
@@ -28,59 +28,32 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### imix-ipsec-ip4routing-base-scale-sw-i40e
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+    ### imix-ipsec-ip4routing-base-scale-hw-i40e
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-hw-base
------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-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]{ipsec-3n-hsw-xl710-64b-base-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-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]{ipsec-3n-hsw-xl710-64b-base-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-base-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-hw-scale
-------------
+imix-ipsec-ip4routing-base-scale-sw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +62,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-scale-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +73,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +82,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-scale-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-sw-base
------------
+imix-ipsec-ip4routing-base-scale-hw-i40e
+---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +105,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-sw-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-sw-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +116,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,6 +125,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-sw-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-sw-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
similarity index 52%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
index cce807148a..4a0bd43926 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
@@ -28,16 +28,26 @@
 
     </script>
 
-3n-skx-x710
-~~~~~~~~~~~
-
-64b-2t1c-base_and_features
---------------------------
+..
+    ## 3n-skx-xxv710
+    ### imix-ipsec-ip4routing-base-scale-i40e
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+    10ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+imix-ipsec-ip4routing-base-scale-i40e
+------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +56,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_features
---------------------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-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 d612a8acce..2b6f4f4d2d 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
@@ -17,8 +17,9 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 CSIT source code for the test cases used for plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1908>`_.
 
 .. toctree::
 
+    ipsec-3n-skx-xxv710
     ipsec-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst
deleted file mode 100644
index 4d210faf50..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-dnv-x553.rst
+++ /dev/null
@@ -1,73 +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>
-
-.. _speedup_graphs_l2sw-2n-dnv-x553:
-
-2n-dnv-x553
-~~~~~~~~~~~
-
-64b-base
---------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-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]{l2sw-2n-dnv-x553-64b-base-ndr-tsa}
-            \label{fig:l2sw-2n-dnv-x553-64b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-dnv-x553-64b-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]{l2sw-2n-dnv-x553-64b-base-pdr-tsa}
-            \label{fig:l2sw-2n-dnv-x553-64b-base-pdr-tsa}
-    \end{figure}
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
index eb5e9cd3b0..cd01c42878 100644
--- 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
@@ -28,16 +28,26 @@
 
     </script>
 
+..
+    ## 2n-skx-x710
+    ### 64b-l2switching-base-scale-avf-i40e
+    2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
+            \label{fig:2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
+            \label{fig:2n-skx-x710-64b-l2switching-base-scale-avf-i40e-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
index 8a6d9b03e5..153d0cf6c3 100644
--- 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
@@ -28,16 +28,124 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-l2switching-base-avf
+    2n1l-10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+
+    ### 64b-l2switching-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-l2switching-base-scale-i40e
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+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-i40e
+------------------------------
+
+.. 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-i40e-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-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-i40e-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-i40e-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-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +154,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +165,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +174,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x520.rst
deleted file mode 100644
index 9f4d01eab4..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x520.rst
+++ /dev/null
@@ -1,239 +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-hsw-x520
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-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]{l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-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]{l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-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]{l2sw-3n-hsw-x520-64b-features-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-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]{l2sw-3n-hsw-x520-64b-features-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-iacl-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]{l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-iacl-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]{l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-    \end{figure}
-
-64b-features-oacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-oacl-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]{l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-oacl-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]{l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-macip
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-macip-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]{l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-macip-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]{l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x710.rst
deleted file mode 100644
index c9a3a76668..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-base_and_scale-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]{l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-base_and_scale-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]{l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-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]{l2sw-3n-hsw-x710-64b-features-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-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]{l2sw-3n-hsw-x710-64b-features-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-iacl-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]{l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-iacl-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]{l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
index 6e9b5a67ae..06643a5337 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
@@ -28,16 +28,26 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-l2switching-base-scale-i40e
+    10ge2p1xl710-eth-l2patch-ndrpdr
+    10ge2p1xl710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xl710-eth-l2xcbase-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base
---------
+64b-l2switching-base-scale-i40e
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
+            \label{fig:/3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-l2switching-base-avf-pdr-tsa}
+            \label{fig:/3n-hsw-xl710-64b-l2switching-base-avf-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
index f7bd35aa9c..1bf16ee062 100644
--- 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
@@ -28,102 +28,26 @@
 
     </script>
 
+..
+    ## 3n-skx-x710
+    ### 64b-l2switching-base-scale-avf-i40e
+    10ge2p1x710-avf-eth-l2patch-ndrpdr
+    10ge2p1x710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr
+
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-base_and_scale-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]{l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-base_and_scale-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]{l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-features-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]{l2sw-3n-skx-x710-64b-features-ndr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-features-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]{l2sw-3n-skx-x710-64b-features-pdr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-features-iacl
------------------
+64b-l2switching-base-scale-avf-i40e
+----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
+            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa}
-            \label{fig:l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
+            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
index cd2f77f927..4e3da4723e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
@@ -28,16 +28,174 @@
 
     </script>
 
+..
+    ## 3n-skx-xxv710
+    ### 64b-l2switching-base-avf
+    10ge2p1xxv710-avf-eth-l2patch-ndrpdr
+    10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-l2switching-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+
+    ### 64b-l2switching-base-scale-i40e
+    10ge2p1xxv710-eth-l2patch-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
+
+    ###  64b-feature-l2switching-base-i40e
+    10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+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-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]{3n-skx-xxv710-64b-l2switching-base-avf-ndr-tsa}
+            \label{fig:3n-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/3n-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]{3n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-l2switching-base-i40e
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-l2switching-base-i40e-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-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-i40e-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/3n-skx-xxv710-64b-l2switching-base-i40e-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-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-l2switching-base-scale-i40e
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-l2switching-base-scale-i40e-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-scale-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-i40e-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/3n-skx-xxv710-64b-l2switching-base-scale-i40e-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-scale-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-feature-l2switching-base-i40e
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +204,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +215,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +224,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-feature-l2switching-base-i40e-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 da7cbc21f6..b32bfe83a4 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
@@ -14,18 +14,13 @@ used for the graphs comes from Phy-to-Phy 64B performance tests with VPP
 L2 Ethernet switching, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1901>`_.
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1908>`_.
 
 .. toctree::
 
-    l2-3n-hsw-x520
-    l2-3n-hsw-x710
-    l2-3n-hsw-xl710
-    l2-3n-skx-x710
-    l2-3n-skx-xxv710
-    l2-2n-skx-x710
     l2-2n-skx-xxv710
-
-..
-    l2-2n-dnv-x553
+    l2-2n-skx-x710
+    l2-3n-skx-xxv710
+    l2-3n-skx-x710
+    l2-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-x520.rst
deleted file mode 100644
index 17a94ba243..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-78b-features
-------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-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]{srv6-3n-hsw-x520-78b-features-ndr-tsa}
-            \label{fig:srv6-3n-hsw-x520-78b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-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]{srv6-3n-hsw-x520-78b-features-pdr-tsa}
-            \label{fig:srv6-3n-hsw-x520-78b-features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst
new file mode 100644
index 0000000000..ee5a2ad80d
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst
@@ -0,0 +1,81 @@
+
+.. 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-hsw-xl710
+    ### 78b-srv6-ip6routing-base-i40e
+    10ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xl710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+78b-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-srv6-ip6routing-base-i40e-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-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
+    \end{figure}
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
new file mode 100644
index 0000000000..2027fa68c3
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
@@ -0,0 +1,81 @@
+
+.. 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-i40e
+    10ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+    10ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+78b-srv6-ip6routing-base-i40e
+----------------------------------
+
+.. 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-i40e-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-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-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-i40e-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-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-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 9c04e29420..3818602e8c 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
@@ -15,8 +15,9 @@ SRv6, 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/vpp/perf/srv6?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1908>`_.
 
 .. toctree::
 
-    srv6-3n-hsw-x520
+    srv6-3n-skx-xxv710
+    srv6-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst
deleted file mode 100644
index 4998aebf60..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst
+++ /dev/null
@@ -1,161 +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-base_and_features-l2sw
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base_and_features-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]{vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base-vm-l2sw
-----------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base-vm-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]{vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-ip4
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-x710-64b-base_and_scale-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]{vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
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
index 3a30932282..853787f1d1 100644
--- 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
@@ -28,59 +28,24 @@
 
     </script>
 
+..
+    ## 2n-skx-xxv710
+    ### 64b-vhost-base-i40e
+    2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    2n1l-10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_features-l2sw
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-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]{vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base-vm-l2sw
-----------------
+64b-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,53 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-ip4
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-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]{vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-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]{vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst
deleted file mode 100644
index eb2656fe19..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.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-hsw-x520
-~~~~~~~~~~~
-
-64b-base_and_features-l2sw
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_features-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]{vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base-vm-l2sw
-----------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base-vm-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]{vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-ip4
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-base_and_scale-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]{vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst
deleted file mode 100644
index 016237f4aa..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.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-hsw-x710
-~~~~~~~~~~~
-
-64b-base_and_features-l2sw
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-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]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_features-vm-l2sw
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-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]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-ip4
-----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-base_and_scale-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]{vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
index 3326fd6dfc..9dbb4ea086 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
@@ -28,145 +28,24 @@
 
     </script>
 
+..
+    ## 3n-hsw-xl710
+    ### 64b-vhost-base-i40e
+    10ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base-l2sw
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-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]{vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-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]{vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-l2sw
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-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]{vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base-vm-l2sw
-----------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base-vm-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]{vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-base_and_scale-ip4
-----------------------
+64b-vhost-base-i40e
+------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
index 258c880c1b..6160447b1c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
@@ -28,103 +28,26 @@
 
     </script>
 
-3n-skx-x710
-~~~~~~~~~~~
-
-64b-base_and_features-l2sw
---------------------------
-
 ..
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-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]{vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+    ## 3n-skx-x710
+    #### 64b-link-bonding-vhost-base-i40e
+    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 
-    64b-base_and_features-vm-l2sw
-    -----------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-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]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+3n-skx-x710
+~~~~~~~~~~~
 
-64b-base_and_scale-ip4
-----------------------
+64b-link-bonding-vhost-base-i40e
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -133,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -144,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -153,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst
new file mode 100644
index 0000000000..b6a0611582
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst
@@ -0,0 +1,131 @@
+
+.. 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-vhost-base-i40e
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+
+    #### 64b-link-bonding-vhost-base-i40e
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-vhost-base-i40e
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-vhost-base-i40e-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-vhost-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-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-vhost-base-i40e-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-vhost-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-link-bonding-vhost-base-i40e
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-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-link-bonding-vhost-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-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/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-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-link-bonding-vhost-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-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 ad4e81037c..2bb4ba820d 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
@@ -15,14 +15,11 @@ VM vhost-user, 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/vpp/perf/vm_vhost?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1908>`_.
 
 .. toctree::
 
-    vm_vhost-3n-hsw-x520
-    vm_vhost-3n-hsw-x710
-    vm_vhost-2n-skx-x710
-
-..
     vm_vhost-2n-skx-xxv710
+    vm_vhost-3n-skx-xxv710
     vm_vhost-3n-skx-x710
+    vm_vhost-3n-hsw-xl710
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-xl710.rst
similarity index 57%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-xl710.rst
index d24b7fb40e..06a73cb0ff 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-hsw-xl710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
-3n-hsw-x710
-~~~~~~~~~~~
+..
+    ## 3n-hsw-xl710
+    ### 114b-vts-l2switching-base-i40e
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 
-64b-1t1c-base_and_features
---------------------------
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+114b-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +53,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr-tsa}
+            \label{fig:3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_features
---------------------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr-tsa}
+            \label{fig:3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-skx-xxv710.rst
similarity index 56%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst
rename to docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-skx-xxv710.rst
index a7687bde27..72beefb6e7 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-skx-xxv710.rst
@@ -28,16 +28,23 @@
 
     </script>
 
-3n-hsw-x520
-~~~~~~~~~~~
+..
+    ## 3n-skx-xxv710
+    ### 64b-vts-l2switching-base-i40e
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+    10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 
-64b-1t1c-base_and_features
---------------------------
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+114b-vts-l2switching-base-i40e
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +53,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_features
---------------------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
-            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
index 7b99ac9abf..33e45f85bd 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
@@ -3,8 +3,8 @@
 
     \clearpage
 
-VTS
-===
+Virtual Topology System
+=======================
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -15,8 +15,9 @@ VM vhost-user, 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/vpp/perf/vts?h=rls1901>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vts?h=rls1908>`_.
 
 .. toctree::
 
-    vts-3n-hsw-x520
+    vts-3n-skx-xxv710
+    vts-3n-hsw-xl710
diff --git a/resources/tools/presentation/doc/report_test_groups.txt b/resources/tools/presentation/doc/report_test_groups.txt
index 7415c479b7..239d077763 100644
--- a/resources/tools/presentation/doc/report_test_groups.txt
+++ b/resources/tools/presentation/doc/report_test_groups.txt
@@ -1,7 +1,7 @@
 Groups of tests for graphs:
-- Packet Throughput (1c)
-- Packet Latency (1c, 2c, 4c)
-- Speedup Multi-Core (1c, 2c, 4c)
+- Packet Throughput (1c), NDR, PDR
+- Packet Latency (1c, 2c, 4c), NDR
+- Speedup Multi-Core (1c, 2c, 4c), NDR, PDR
 
 Order of chapters:
 - L2 Ethernet Switching
@@ -322,13 +322,13 @@ Sub-chapters titles:
 # Virtual Topology System
 
 ## 3n-skx-xxv710
-### 64b-?t?c-vts-l2switching-base-i40e
+### 114b-?t?c-vts-l2switching-base-i40e
 10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 
 ## 3n-hsw-xl710
-### 64b-?t?c-vts-l2switching-base-i40e
+### 114b-?t?c-vts-l2switching-base-i40e
 10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 02141ac162..88466cffa3 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -2003,13 +2003,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "PDR"
@@ -2025,13 +2025,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "PDR"
@@ -2047,13 +2047,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "NDR"
@@ -2069,13 +2069,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "NDR"
@@ -2091,13 +2091,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
@@ -2113,13 +2113,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
@@ -2135,13 +2135,13 @@
 #  algorithm: "table_performance_comparison"
 #  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
 #  history:
-#    - title: "rls1810"
+#    - title: "rls1901"
 #      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1904"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1908"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
@@ -2157,13 +2157,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2179,13 +2179,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2201,13 +2201,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2223,13 +2223,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2245,13 +2245,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2267,13 +2267,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2289,13 +2289,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2311,13 +2311,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2333,13 +2333,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2355,13 +2355,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2377,13 +2377,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2399,13 +2399,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2573,13 +2573,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2595,13 +2595,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2617,13 +2617,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2639,13 +2639,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2661,13 +2661,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2683,13 +2683,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2705,13 +2705,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2727,13 +2727,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2749,13 +2749,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -3411,13 +3411,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3433,13 +3433,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3455,13 +3455,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3477,13 +3477,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3499,13 +3499,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3521,13 +3521,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3543,13 +3543,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3565,13 +3565,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3663,13 +3663,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3685,13 +3685,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3707,13 +3707,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3729,13 +3729,13 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    - title: "rls1901"
       data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1908"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3826,34 +3826,6 @@
   - "doc"
   - "status"
 
-################################################################################
-# NSH SFC
-#-
-#  type: "table"
-#  title: "Detailed Test Results - NSH SFC Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    "nsh-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
-
 ################################################################################
 # DMM
 - type: "table"
@@ -4453,6 +4425,51 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
+## Plots VPP HTTP Server Performance
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+#  # each tag is enclosed with ' (apostrophe).
+#  filter: "'HTTP' and 'TCP_CPS'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-cps"
+#
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  filter: "'HTTP' and 'TCP_RPS'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-rps"
+
+################################################################################
+
 # Soak Test (PLRsearch), boxes
 - type: "plot"
   title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
@@ -6255,21328 +6272,6021 @@
     layout: "plot-service-density"
 
 ################################################################################
-## Plots VPP HTTP Server Performance
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-#  # each tag is enclosed with ' (apostrophe).
-#  filter: "'HTTP' and 'TCP_CPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-cps"
-#
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_RPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-rps"
 
-################################################################################
+# Packet Throughput
 
-# Example plots
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+    layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
   algorithm: "plot_performance_name_box"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars_name"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis_name"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "3n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr"
+    layout: "plot-throughput"
 
-################################################################################
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
+    title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features-iacl
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+    title: "3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+    title: "3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features-oacl
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+    title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710 features
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+  title: "Throughput: 3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+    title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+  title: "Throughput: 3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+    title: "3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710 features-iacl
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    title: "3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+    title: "3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+  title: "Throughput: 3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  title: "Throughput: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "Throughput: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "Throughput: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 features
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 features-iacl
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    title: "3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  title: "Throughput: 3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  title: "Throughput: 3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+    title: "3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-xxv710 base
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "Throughput: 3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP L2 2n-dnv-x553 base
-#- type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
 #- type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
+#  title: "Throughput: 3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
+#  algorithm: "plot_performance_name_box"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
 #  layout:
-#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#    title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
+#  title: "Throughput: 3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
+#  algorithm: "plot_performance_name_box"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
 #  layout:
-#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#    title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
 #    layout: "plot-throughput"
 
-################################################################################
+- type: "plot"
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
+    layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-x520
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+    title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+  title: "Throughput: 3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+    title: "3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-x710
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  title: "Throughput: 3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+    title: "3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Throughput: 3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr"
+  algorithm: "plot_performance_name_box"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr"
     layout: "plot-throughput"
 
+################################################################################
+
+# Packet Latency 1C
+
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+    layout: "plot-latency"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-xl710
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-latency"
 
-# Packet Throughput - VPP Container Memif 3n-skx-x710
 - type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  title: "Latency: 3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-2t1c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr"
+    layout: "plot-latency"
 
-# Packet Throughput - VPP Container Memif 2n-skx-x710
 - type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
+    title: "3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+  title: "Latency: 2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
+    title: "2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+  title: "Latency: 2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP Container Memif 2n-skx-xxv710
-#- type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv6 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 2n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv6 2n-dnv-x553 base
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 3n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 2n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 2n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP VTS 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '1T1C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '2T2C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '1T1C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '2T2C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 2n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-hsw-xl710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-skx-xxv710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 2n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 2n-skx-xxv710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Latency - VPP L2 3n-hsw-x520 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-iacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-macip
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x710 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x710 features
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x710 features-iacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-xl710 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710 features
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710 features-iacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-xxv710 base
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 2n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ETH' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 2n-skx-xxv710 base and scale
-- type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-xl710
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-skx-x710
-- type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 2n-skx-x710
-- type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP Container Memif 2n-skx-xxv710
-#- type: "plot"
-#  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 features
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 features nat44
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 features
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 features nat44
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+  title: "Latency: 3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+  title: "Latency: 2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 features iacl
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-avf-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features nat44
 - type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features iacl
 - type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-x710 base and scale
+#- type: "plot"
+#  title: "Latency: 3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat"
+#  algorithm: "plot_latency_error_bars_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
+#  layout:
+#    title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
+#    layout: "plot-latency"
+
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Latency: 3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-xxv710 base and scale
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-114b-1t1c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 ################################################################################
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
+# Packet Latency 2C
+
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-memif-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "Latency: 2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-4t2c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-4t2c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-4t2c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-4t2c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-4t2c-ethip4udp-ip4base-nat44-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-2t2c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-2t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t2c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-4t2c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-4t2c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-4t2c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-avf-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-4t2c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-4t2c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-4t2c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t2c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-feature-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-feature-ip4routing-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-4t2c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-4t2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-4t2c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-feature-ip4routing-base-i40e-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP IPv6 3n-hsw-x520
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t2c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
+    title: "3n-hsw-xl710-64b-2t2c-ip4tunnel-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-4t2c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-4t2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-4t2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-hsw-x710
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-4t2c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-4t2c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-4t2c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    title: "2n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-4t2c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-4t2c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-4t2c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-4t2c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-4t2c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-hsw-xl710
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-2t2c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-2t2c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t2c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
+    title: "3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-4t2c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-4t2c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-4t2c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
+    title: "3n-skx-x710-78b-4t2c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-skx-x710
 - type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-4t2c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-4t2c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-4t2c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-4t2c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-4t2c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-skx-xxv710
 - type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Latency: 3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-x710
 - type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-4t2c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-4t2c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-4t2c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-xxv710
 - type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-4t2c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-4t2c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-4t2c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 - type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-2t2c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-l2switching-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-2t2c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t2c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-2t2c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t2c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t2c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-64b-2t2c-l2switching-base-scale-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-4t2c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-x710-64b-4t2c-l2switching-base-scale-avf-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-4t2c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-4t2c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-avf-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-4t2c-l2switching-base-avf-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-4t2c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-4t2c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-4t2c-l2switching-base-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-4t2c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-4t2c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-4t2c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
+    title: "3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-latency"
 
-################################################################################
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-4t2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-4t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-4t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-4t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-4t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-4t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-i40e-ndr"
+    layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 base
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "2n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "3n-hsw-xl710-64b-2t2c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 scale
+#- type: "plot"
+#  title: "Latency: 3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat"
+#  algorithm: "plot_latency_error_bars_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
+#  layout:
+#    title: "3n-skx-x710-64b-4t2c-link-bonding-vhost-base-i40e-ndr"
+#    layout: "plot-latency"
+
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "3n-hsw-xl710-114b-2t2c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    title: "3n-skx-xxv710-114b-4t2c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 ################################################################################
 
-# Packet Latency - VPP SRv6 3n-hsw-x520
+# Packet Latency 4C
+
 - type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-memif-base-i40e-ndr"
     layout: "plot-latency"
 
-################################################################################
+- type: "plot"
+  title: "Latency: 2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-8t4c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x520
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-8t4c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-8t4c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-8t4c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-8t4c-ethip4udp-ip4base-nat44-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-4t4c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-4t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-4t4c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  title: "Latency: 3n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-8t4c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-8t4c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    title: "3n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-8t4c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x710
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-8t4c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-8t4c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-8t4c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-8t4c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-8t4c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-8t4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-8t4c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-4t4c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "3n-hsw-xl710-64b-4t4c-ip4tunnel-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-8t4c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-8t4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-8t4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+  title: "Latency: 2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-8t4c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-8t4c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-8t4c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
+  title: "Latency: 2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-8t4c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-8t4c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-8t4c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-8t4c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-8t4c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-4t4c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-4t4c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-4t4c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-skx-x710
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-8t4c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-8t4c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-8t4c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-skx-x710-78b-8t4c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-8t4c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-8t4c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-8t4c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-8t4c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-8t4c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  title: "Latency: 3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  title: "Latency: 3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+  title: "Latency: 3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-8t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-8t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-8t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+  title: "Latency: 2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-8t4c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 2n-skx-x710
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-8t4c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-8t4c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-8t4c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-8t4c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-8t4c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  title: "Latency: 3n-hsw-xl710-64b-4t4c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-l2switching-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-4t4c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-4t4c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-4t4c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-4t4c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-4t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-4t4c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "3n-hsw-xl710-64b-4t4c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  title: "Latency: 3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-8t4c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "3n-skx-x710-64b-8t4c-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-8t4c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-8t4c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-avf-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-8t4c-l2switching-base-avf-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-8t4c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-8t4c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 2n-skx-xxv710
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-8t4c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-8t4c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-8t4c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
-#- type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#- type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-#- type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP VTS 3n-hsw-x520
 - type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  title: "Latency: 3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '1T1C' and
-           'VTS'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    title: "3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '2T2C' and
-           'VTS'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-8t4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-8t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-8t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-8t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-8t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-8t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - DPDK l3fwd 3n-hsw-x520
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "2n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "3n-hsw-xl710-64b-4t4c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x710
+#- type: "plot"
+#  title: "Latency: 3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat"
+#  algorithm: "plot_latency_error_bars_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
+#  layout:
+#    title: "3n-skx-x710-64b-8t4c-link-bonding-vhost-base-i40e-ndr"
+#    layout: "plot-latency"
+
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-xl710
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "3n-hsw-xl710-114b-4t4c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Latency: 3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr-lat"
+  algorithm: "plot_latency_error_bars_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "3n-skx-xxv710-114b-8t4c-vts-l2switching-base-i40e-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-skx-x710
+################################################################################
+
+# Packet Speedup
+
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-memif-base-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-memif-base-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK l3fwd 3n-skx-xxv710
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-memif-base-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK l3fwd 2n-skx-x710
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK l3fwd 2n-skx-xxv710
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-################################################################################
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x520
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x710
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 3n-hsw-xl710
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Eth-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-ip4routing-base-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 3n-skx-x710
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Eth-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-ip4routing-base-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 3n-skx-xxv710
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 2n-skx-x710
 - type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 2n-skx-xxv710
 - type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "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-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-################################################################################
+- type: "plot"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "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-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
+  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-base_and_features-pdr"
+  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-pdr"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-xl710
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: 3n-hsw-xl710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-ip6routing-base-scale-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-78b-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: 3n-hsw-xl710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-ip6routing-base-scale-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-pdr"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-78b-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-skx-x710
 - type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: 3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: 3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 2n-skx-x710
-- type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
+  title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP Container Memif 2n-skx-xxv710
-#- type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Speedup - VPP IPv4 3n-hsw-x520 base and scale
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x520 features
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-features-ndr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-features-pdr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x520 features nat44
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
+  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-features-nat44-pdr"
+  title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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-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-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x520 features iacl
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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-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: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
+    title: "3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-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"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-iacl-pdr"
+    title: "2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x520 features oacl
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-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"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
+    title: "2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-avf-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "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-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-pdr"
+    title: "2n-skx-xxv710-64b-l2switching-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 base and scale
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "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-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "2n-skx-xxv710-64b-l2switching-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "2n-skx-xxv710-64b-l2switching-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 features
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-ndr"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-l2switching-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-pdr"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 features nat44
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
+  title: "Speedup: 3n-hsw-xl710-64b-l2switching-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-l2switching-base-scale-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-nat44-pdr"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-64b-l2switching-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 features iacl
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  title: "Speedup: 3n-hsw-xl710-64b-l2switching-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-l2switching-base-scale-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
+    title: "3n-hsw-xl710-64b-l2switching-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
+    title: "3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-xl710 base and scale
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-base-ndr"
+    title: "3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-avf-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "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"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-base-pdr"
+    title: "3n-skx-xxv710-64b-l2switching-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710 base and scale
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "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"
   layout:
-    title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "3n-skx-xxv710-64b-l2switching-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "3n-skx-xxv710-64b-l2switching-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710 features
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-features-ndr"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-l2switching-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-features-pdr"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710 features nat44
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-features-nat44-pdr"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710 features iacl
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
+    title: "3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  title: "Speedup: 3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
+    title: "3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP IPv4 3n-skx-x710 features oacl
-#- type: "plot"
-#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-features-oacl-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-x710 base and scale
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
+    title: "3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
+    title: "3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-x710 features iacl
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-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"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-features-iacl-ndr"
+    title: "2n-skx-xxv710-64b-vhost-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  include:
+    - "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-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-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"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-x710-64b-features-iacl-pdr"
+    title: "2n-skx-xxv710-64b-vhost-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-xxv710 base and scale
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
+    title: "3n-hsw-xl710-64b-vhost-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  title: "Speedup: 3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "3n-hsw-xl710-64b-vhost-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP IPv4 2n-dnv-x553 base
 #- type: "plot"
-#  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
+#  title: "Speedup: 3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
 #  layout:
-#    title: "ip4-2n-dnv-x553-64b-base-ndr"
+#    title: "3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
+#  title: "Speedup: 3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  include:
+#    - ""
 #  layout:
-#    title: "ip4-2n-dnv-x553-64b-base-pdr"
+#    title: "3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  title: "Speedup: 3n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
+    title: "3n-skx-xxv710-64b-vhost-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  title: "Speedup: 3n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_features-pdr"
+    title: "3n-skx-xxv710-64b-vhost-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
+  title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-pdr"
+  title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: 3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
+    title: "3n-hsw-xl710-114b-vts-l2switching-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: 3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710
-- type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "3n-hsw-xl710-114b-vts-l2switching-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: 3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-pdr"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
 - type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: 3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  include:
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
+    title: "3n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Packet Throughput - DPDK l3fwd 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'ENCAP' and
+           'BASE' and
            'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-hsw-x710 features
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-hsw-xl710
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
 - type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-skx-x710
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-skx-x710 features
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 3n-skx-x710
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 3n-skx-xxv710
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-xxv710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-xxv710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 2n-skx-x710
 - type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
 - type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 2n-skx-xxv710
 - type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP IPv6 2n-dnv-x553 base
-#- type: "plot"
-#  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPv6 tunnels 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'LISP' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 2n-skx-x710
 - type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'LISP' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 base
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 scale
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 sw
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP SRv6 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+################################################################################
 
+# Packet Throughput - DPDK testpmd 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 features
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 features-iacl
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 features-oacl
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 3n-hsw-xl710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 features-oacl
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x520 features-macip
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 3n-skx-x710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x710 features
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 3n-skx-xxv710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-x710 features-iacl
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-hsw-xl710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 2n-skx-x710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-skx-x710 features
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - DPDK testpmd 2n-skx-xxv710
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-skx-x710 features-iacl
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Speedup - VPP L2 3n-skx-xxv710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'DRV_AVF' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+################################################################################
 
+# Packet Latency - DPDK l3fwd 3n-hsw-x520
 - type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'DRV_AVF' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP L2 2n-skx-x710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
+# Packet Latency - DPDK l3fwd 3n-hsw-x710
 - type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP L2 2n-skx-xxv710 base and scale
 - type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
+# Packet Latency - DPDK l3fwd 3n-hsw-xl710
 - type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP L2 2n-dnv-x553 base
-#- type: "plot"
-#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost ip4 3n-hsw-x520
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
+# Packet Latency - DPDK l3fwd 3n-skx-x710
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
+# Packet Latency - DPDK l3fwd 3n-skx-xxv710
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost ip4 3n-hsw-x710
+# Packet Latency - DPDK l3fwd 2n-skx-x710
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
+# Packet Latency - DPDK l3fwd 2n-skx-xxv710
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+################################################################################
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
+# Packet Latency - DPDK testpmd 3n-hsw-x520
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost ip4 3n-skx-x710
+# Packet Latency - DPDK testpmd 3n-hsw-x710
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost ip4 2n-skx-x710
+# Packet Latency - DPDK testpmd 3n-hsw-xl710
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
+# Packet Latency - DPDK testpmd 3n-skx-x710
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
+# Packet Latency - DPDK testpmd 3n-skx-xxv710
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Packet Speedup - VPP vhost ip4 2n-skx-xxv710
+# Packet Latency - DPDK testpmd 2n-skx-x710
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
-#- type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#- type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP vts 3n-hsw-x520
+# Packet Latency - DPDK testpmd 2n-skx-xxv710
 - type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'VTS'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'VTS'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"