CSIT-1208: Add new data to 1807 report

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

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 0339774..6180035 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 LXC/DRC Container Memif
 =======================
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -116,6 +133,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -144,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -169,6 +194,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -197,6 +226,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 

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
index 8f5f653..134adb4 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 K8s Container Memif
 ===================
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 

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 92180f5..5f5715e 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Routing
 ============
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -88,6 +101,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -113,6 +130,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -141,6 +162,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -166,6 +191,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -191,6 +220,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -216,6 +249,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -244,6 +281,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -269,6 +310,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -297,6 +342,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -322,6 +371,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-features
 -----------------
 
@@ -347,6 +400,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-features
 -----------------
 
@@ -372,108 +429,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip4-3n-skx-xxv710-64b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
-    \end{figure}
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip4-3n-skx-xxv710-64b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -503,6 +461,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -528,6 +490,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -556,6 +522,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 

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 aa74c42..e3baf42 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Tunnels
 ============
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -116,6 +133,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -144,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 

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 5e26f9d..c298125 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Routing
 ============
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -63,55 +72,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-hsw-x520-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
-    \end{figure}
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-hsw-x520-78b-2t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
-    \end{figure}
+    \clearpage
 
 3n-hsw-x710
 ~~~~~~~~~~~
@@ -141,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -166,55 +133,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-hsw-x710-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat}
-    \end{figure}
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-hsw-x710-78b-2t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat}
-    \end{figure}
+    \clearpage
 
 3n-hsw-xl710
 ~~~~~~~~~~~~
@@ -244,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -269,6 +194,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -297,6 +226,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 
@@ -322,158 +255,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
-78b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-x710-78b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-features-ndr-lat}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-features-ndr-lat}
-    \end{figure}
-
-78b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-x710-78b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-features-ndr-lat}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-features-ndr-lat}
-    \end{figure}
-
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-    \end{figure}
-
-78b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-    \end{figure}
-
-78b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat}
-    \end{figure}
-
-78b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -503,6 +287,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 
@@ -528,6 +316,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -556,6 +348,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 

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
index 60b4d61..ea4705e 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Tunnels
 ============
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 

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 c4797e1..191af5d 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPSec IPv4 Routing
 ==================
 
@@ -41,6 +46,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 

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 d9af49e..80f63cd 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 L2 Ethernet Switching
 =====================
 
@@ -38,6 +43,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -88,6 +101,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -113,6 +130,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -141,6 +162,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -166,6 +191,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -191,6 +220,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -216,6 +249,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -244,6 +281,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -269,6 +310,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -297,6 +342,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -322,6 +371,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-features
 -----------------
 
@@ -347,6 +400,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-features
 -----------------
 
@@ -372,6 +429,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -400,6 +461,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -425,55 +490,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
-    \end{figure}
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Latency: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -503,6 +522,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -528,6 +551,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -556,6 +583,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 

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 a7084c2..477e7e0 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 SRv6 Routing
 ============
 
@@ -14,7 +19,7 @@ CSIT source code for the test cases used for plots can be found in
 ~~~~~~~~~~~
 
 78b-1t1c-features
------------------------
+-----------------
 
 .. raw:: html
 
@@ -38,8 +43,12 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-features
------------------------
+-----------------
 
 .. raw:: html
 

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 a756bd6..65aba07 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 KVM VMs vhost-user
 ==================
 
@@ -39,6 +44,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-l2sw
 ----------------------------
 
@@ -64,6 +73,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
             \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
 ---------------------------
 
@@ -114,6 +131,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -142,6 +163,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-l2sw
 ----------------------------
 
@@ -167,6 +192,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -192,6 +221,10 @@ CSIT source code for the test cases used for plots can be found in
             \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
 ---------------------------
 
@@ -217,6 +250,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -245,6 +282,10 @@ CSIT source code for the test cases used for plots can be found in
             \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
 ----------------------------
 
@@ -270,6 +311,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -295,6 +340,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-ip4
 ---------------------------
 

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 15d5309..fbc6a41 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 VTS
 ===
 
@@ -14,19 +19,19 @@ CSIT source code for the test cases used for plots can be found in
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c
---------
+114b-1t1c
+---------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Latency: vts-3n-hsw-x520-64b-1t1c-ndr`
+:index:`Latency: vts-3n-hsw-x520-114b-1t1c-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-1t1c-ndr-lat.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -35,23 +40,27 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-1t1c-ndr-lat}
-            \label{fig:vts-3n-hsw-x520-64b-1t1c-ndr-lat}
+            \includegraphics[clip, trim=0cm 8cm 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}
 
-64b-2t2c
---------
+.. raw:: latex
+
+    \clearpage
+
+114b-2t2c
+---------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Latency: vts-3n-hsw-x520-64b-2t2c-ndr`
+:index:`Latency: vts-3n-hsw-x520-114b-2t2c-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-2t2c-ndr-lat.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -60,6 +69,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-2t2c-ndr-lat}
-            \label{fig:vts-3n-hsw-x520-64b-2t2c-ndr-lat}
+            \includegraphics[clip, trim=0cm 8cm 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/container_memif.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
index 25ed3ba..7600db6 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 LXC/DRC Container Memif
 =======================
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,6 +124,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -139,6 +160,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -157,6 +182,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -186,6 +215,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -204,6 +237,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -236,6 +273,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -254,6 +295,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -283,6 +328,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -301,6 +350,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -333,6 +386,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -351,6 +408,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -380,6 +441,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html

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
index e859fb3..9fcf05b 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_orchestrated.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 K8s Container Memif
 ===================
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,6 +124,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -139,6 +160,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -157,6 +182,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -186,6 +215,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput:  k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html

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 e35b914..e3ca78b 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Routing
 ============
 
@@ -29,8 +34,6 @@ CSIT source code for the test cases used for plots can be found in
     <p><br><br></p>
     </center>
 
-.. raw:: latex
-
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
@@ -42,6 +45,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +67,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +100,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,6 +122,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -136,6 +155,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr`
 
 .. raw:: html
@@ -154,6 +177,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -183,6 +210,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr`
 
 .. raw:: html
@@ -201,6 +232,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -233,6 +268,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -251,6 +290,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -280,6 +323,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -298,6 +345,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -327,6 +378,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr`
 
 .. raw:: html
@@ -345,6 +400,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -374,6 +433,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr`
 
 .. raw:: html
@@ -392,6 +455,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-features}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -424,6 +491,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -442,6 +513,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -471,6 +546,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -489,6 +568,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -521,6 +604,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -539,6 +626,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -568,6 +659,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -586,6 +681,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-features
 -----------------
 
@@ -615,6 +714,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr`
 
 .. raw:: html
@@ -633,6 +736,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-2t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-features
 -----------------
 
@@ -662,6 +769,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr`
 
 .. raw:: html
@@ -680,196 +791,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-features}
     \end{figure}
 
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
-    \end{figure}
-
-64b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
-    \end{figure}
-
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-features-ndr}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-features-pdr}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-features-pdr}
-    \end{figure}
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-features-ndr}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-features-pdr}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-features}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -903,6 +827,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -921,6 +849,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -950,6 +882,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -968,6 +904,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -1000,6 +940,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -1018,6 +962,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -1047,6 +995,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html

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 36c7270..082a9e9 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Tunnels
 ============
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,6 +124,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -139,6 +160,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -157,6 +182,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -186,6 +215,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -204,6 +237,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -236,6 +273,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -254,6 +295,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -283,6 +328,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html

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 0ada869..6a265ca 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Routing
 ============
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,99 +124,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
     \end{figure}
 
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x520-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-features-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x520-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-features-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-features-pdr}
-    \end{figure}
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x520-78b-2t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-features-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x520-78b-2t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-features-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-features}
-    \end{figure}
+    \clearpage
 
 3n-hsw-x710
 ~~~~~~~~~~~
@@ -233,6 +160,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -251,6 +182,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -280,6 +215,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -298,99 +237,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr}
     \end{figure}
 
-78b-1t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x710-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-features-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x710-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-features-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-features-pdr}
-    \end{figure}
-
-78b-2t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x710-78b-2t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-features-ndr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-hsw-x710-78b-2t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-features-pdr}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-features}
-    \end{figure}
+    \clearpage
 
 3n-hsw-xl710
 ~~~~~~~~~~~~
@@ -424,6 +273,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -442,6 +295,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -471,6 +328,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -489,6 +350,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -521,6 +386,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -539,6 +408,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 
@@ -568,6 +441,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -586,290 +463,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr}
     \end{figure}
 
-78b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-x710-78b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-features-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-x710-78b-2t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-features-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-features-pdr}
-    \end{figure}
-
-78b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-x710-78b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-features-ndr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-x710-78b-4t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-features-pdr}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-features}
-    \end{figure}
-
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-78b-2t1c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-
-78b-4t2c-base_and_scale
------------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-    \end{figure}
-
-78b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-features-ndr}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-features-pdr}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-features-pdr}
-    \end{figure}
-
-78b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-features-ndr}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-features-pdr}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-features}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -903,6 +499,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -921,6 +521,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 
@@ -950,6 +554,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -968,6 +576,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -1000,6 +612,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -1018,6 +634,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-4t2c-base_and_scale
 -----------------------
 
@@ -1047,6 +667,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr`
 
 .. raw:: html

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
index 21bf1a2..8e45bed 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Tunnels
 ============
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr`
 
 .. raw:: html

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 a84773a..3f15a21 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPSec IPv4 Routing
 ==================
 
@@ -45,6 +50,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -63,6 +72,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -92,6 +105,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html

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 03d4f48..3322b90 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 L2 Ethernet Switching
 =====================
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -107,6 +124,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -136,6 +157,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr`
 
 .. raw:: html
@@ -154,6 +179,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -183,6 +212,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr`
 
 .. raw:: html
@@ -201,6 +234,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -233,6 +270,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -251,6 +292,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -280,6 +325,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -298,6 +347,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-features
 -----------------
 
@@ -327,6 +380,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr`
 
 .. raw:: html
@@ -345,6 +402,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-features
 -----------------
 
@@ -374,6 +435,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr`
 
 .. raw:: html
@@ -392,6 +457,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-features}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -424,6 +493,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -442,6 +515,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale
 -----------------------
 
@@ -471,6 +548,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -489,6 +570,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -521,6 +606,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -539,6 +628,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -568,6 +661,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -586,6 +683,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t1c-features
 -----------------
 
@@ -615,6 +716,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr`
 
 .. raw:: html
@@ -633,6 +738,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-features
 -----------------
 
@@ -662,6 +771,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr`
 
 .. raw:: html
@@ -680,6 +793,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-features}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -712,6 +829,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -730,6 +851,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -759,6 +884,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -777,99 +906,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr}
     \end{figure}
 
-64b-2t1c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-features-ndr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: l2sw-3n-skx-xxv710-64b-2t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-features-pdr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-features-pdr}
-    \end{figure}
-
-64b-4t2c-features
------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-features-ndr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-features-ndr}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Throughput: l2sw-3n-skx-xxv710-64b-4t2c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-features-pdr.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-features-pdr}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-features}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -903,6 +942,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -921,6 +964,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -950,6 +997,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -968,6 +1019,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -1000,6 +1055,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -1018,6 +1077,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-4t2c-base_and_scale
 -----------------------
 
@@ -1047,6 +1110,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr`
 
 .. raw:: html

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 ffc1081..1872d51 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 SRv6 Routing
 ============
 
@@ -42,6 +47,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr`
 
 .. raw:: html
@@ -60,6 +69,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-2t2c-features
 -----------------
 
@@ -89,6 +102,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr`
 
 .. raw:: html

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 2029254..32c99d6 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 KVM VMs vhost-user
 ==================
 
@@ -43,6 +48,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -61,6 +70,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-l2sw
 ----------------------------
 
@@ -90,6 +103,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -108,6 +125,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -137,6 +158,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -155,6 +180,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-ip4
 ---------------------------
 
@@ -184,6 +213,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -202,6 +235,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -234,6 +271,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -252,6 +293,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-l2sw
 ----------------------------
 
@@ -281,6 +326,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -299,6 +348,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -328,6 +381,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -346,6 +403,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-ip4
 ---------------------------
 
@@ -375,6 +436,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -393,6 +458,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -425,6 +494,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -443,6 +516,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-l2sw
 ----------------------------
 
@@ -472,6 +549,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html
@@ -490,6 +571,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-1t1c-base_and_scale-ip4
 ---------------------------
 
@@ -519,6 +604,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
 
 .. raw:: html
@@ -537,6 +626,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-2t2c-base_and_scale-ip4
 ---------------------------
 
@@ -566,6 +659,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
 
 .. raw:: html

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 3452556..7593612 100644 (file)
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 VTS
 ===
 
@@ -14,19 +19,19 @@ CSIT source code for the test cases used for plots can be found in
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c
---------
+114b-1t1c
+---------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: vts-3n-hsw-x520-64b-1t1c-ndr`
+:index:`Throughput: vts-3n-hsw-x520-114b-1t1c-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-1t1c-ndr.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-ndr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -35,20 +40,24 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-1t1c-ndr}
-            \label{fig:vts-3n-hsw-x520-64b-1t1c-ndr}
+            \includegraphics[clip, trim=0cm 8cm 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:: html
 
     <center><b>
 
-:index:`Throughput: vts-3n-hsw-x520-64b-1t1c-pdr`
+.. raw:: latex
+
+    \clearpage
+
+:index:`Throughput: vts-3n-hsw-x520-114b-1t1c-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-1t1c-pdr.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-1t1c-pdr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -57,23 +66,27 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-1t1c-pdr}
-            \label{fig:vts-3n-hsw-x520-64b-1t1c-pdr}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-1t1c-pdr}
+            \label{fig:vts-3n-hsw-x520-114b-1t1c-pdr}
     \end{figure}
 
-64b-2t2c
---------
+.. raw:: latex
+
+    \clearpage
+
+114b-2t2c
+---------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: vts-3n-hsw-x520-64b-2t2c-ndr`
+:index:`Throughput: vts-3n-hsw-x520-114b-2t2c-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-2t2c-ndr.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-ndr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -82,20 +95,24 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-2t2c-ndr}
-            \label{fig:vts-3n-hsw-x520-64b-2t2c-ndr}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-2t2c-ndr}
+            \label{fig:vts-3n-hsw-x520-114b-2t2c-ndr}
     \end{figure}
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: vts-3n-hsw-x520-64b-2t2c-pdr`
+.. raw:: latex
+
+    \clearpage
+
+:index:`Throughput: vts-3n-hsw-x520-114b-2t2c-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-2t2c-pdr.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-2t2c-pdr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -104,6 +121,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-2t2c-pdr}
-            \label{fig:vts-3n-hsw-x520-64b-2t2c-pdr}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-114b-2t2c-pdr}
+            \label{fig:vts-3n-hsw-x520-114b-2t2c-pdr}
     \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 dfb79d9..5daf700 100644 (file)
--- 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
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 LXC/DRC Container Memif
 =======================
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -94,6 +107,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -112,6 +129,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -144,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -162,6 +187,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -194,6 +223,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: memif-3n-skx-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html

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
index 488dbb9..418a158 100644 (file)
--- 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
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 K8s Container Memif
 ===================
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -94,6 +107,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html

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 7df4c7a..7be9969 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Routing
 ============
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-x520-64b-features-pdr`
 
 .. raw:: html
@@ -109,6 +126,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x520-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -141,6 +162,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -159,6 +184,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -188,6 +217,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-x710-64b-features-pdr`
 
 .. raw:: html
@@ -206,6 +239,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-x710-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -238,6 +275,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -256,6 +297,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -285,6 +330,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-hsw-xl710-64b-features-pdr`
 
 .. raw:: html
@@ -303,6 +352,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-hsw-xl710-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -335,6 +388,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-skx-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -353,6 +410,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -382,6 +443,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-3n-skx-xl710-64b-features-pdr`
 
 .. raw:: html
@@ -400,102 +465,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-3n-skx-xl710-64b-features-pdr-tsa}
     \end{figure}
 
-3n-skx-xxv710
-~~~~~~~~~~~~~
-
-64b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-64b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip4-3n-skx-xxv710-64b-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-features-ndr-tsa}
-            \label{fig:ip4-3n-skx-xxv710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip4-3n-skx-xxv710-64b-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-features-pdr-tsa}
-            \label{fig:ip4-3n-skx-xxv710-64b-features-pdr-tsa}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -529,6 +501,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -547,6 +523,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -579,6 +559,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr`
 
 .. raw:: html

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 2b36ec6..588697d 100644 (file)
--- 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
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv4 Tunnels
 ============
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -94,6 +107,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -112,6 +129,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -144,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -162,6 +187,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -194,6 +223,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip4tun-3n-skx-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html

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 ae7246b..991e7ab 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Routing
 ============
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,52 +71,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa}
     \end{figure}
 
-78b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-hsw-x520-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-features-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-features-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-hsw-x520-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-features-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-features-pdr-tsa}
-    \end{figure}
+    \clearpage
 
 3n-hsw-x710
 ~~~~~~~~~~~
@@ -141,6 +107,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr`
 
 .. raw:: html
@@ -159,52 +129,9 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa}
     \end{figure}
 
-78b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-hsw-x710-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-features-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-features-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-hsw-x710-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-features-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x710-78b-features-pdr-tsa}
-    \end{figure}
+    \clearpage
 
 3n-hsw-xl710
 ~~~~~~~~~~~~
@@ -238,6 +165,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr`
 
 .. raw:: html
@@ -256,6 +187,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 78b-features
 ------------
 
@@ -285,6 +220,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-3n-hsw-xl710-78b-1t1c-features-pdr`
 
 .. raw:: html
@@ -303,105 +242,12 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-3n-hsw-xl710-78b-features-pdr-tsa}
     \end{figure}
 
-3n-skx-x710
-~~~~~~~~~~~
-
-78b-base_and_scale
-------------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-skx-xl710-78b-base_and_scale-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-skx-xl710-78b-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-78b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-skx-xl710-78b-1t1c-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-features-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-features-ndr-tsa}
-            \label{fig:ip6-3n-skx-xl710-78b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
+    \clearpage
 
-:index:`Speedup: ip6-3n-skx-xl710-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-features-pdr-tsa}
-            \label{fig:ip6-3n-skx-xl710-78b-features-pdr-tsa}
-    \end{figure}
-
-3n-skx-xxv710
-~~~~~~~~~~~~~
+3n-skx-x710
+~~~~~~~~~~~
 
 78b-base_and_scale
 ------------------
@@ -410,12 +256,12 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
-:index:`Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr`
+:index:`Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -424,45 +270,24 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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 8cm 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:: html
 
     <center><b>
 
-:index:`Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 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}
-    \end{figure}
+    \clearpage
 
-78b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-skx-xxv710-78b-1t1c-features-ndr`
+:index:`Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-features-ndr-tsa.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -471,31 +296,13 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-features-ndr-tsa}
-            \label{fig:ip6-3n-skx-xxv710-78b-features-ndr-tsa}
+            \includegraphics[clip, trim=0cm 8cm 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:: html
-
-    <center><b>
-
-:index:`Speedup: ip6-3n-skx-xxv710-78b-1t1c-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-features-pdr-tsa}
-            \label{fig:ip6-3n-skx-xxv710-78b-features-pdr-tsa}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -529,6 +336,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr`
 
 .. raw:: html
@@ -547,6 +358,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -579,6 +394,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr`
 
 .. raw:: html

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
index 4f2fdac..496900a 100644 (file)
--- 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
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPv6 Tunnels
 ============
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr`
 
 .. raw:: html

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 82124a3..3c7e3a6 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 IPSec IPv4 Routing
 ==================
 
@@ -46,6 +51,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: ipsec-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html

diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 3c3be82..2367db5 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 L2 Ethernet Switching
 =====================
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-x520-64b-features-pdr`
 
 .. raw:: html
@@ -109,6 +126,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-x520-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -141,6 +162,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -159,6 +184,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -188,6 +217,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-x710-64b-features-pdr`
 
 .. raw:: html
@@ -206,6 +239,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-x710-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -238,6 +275,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -256,6 +297,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -285,6 +330,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-hsw-xl710-64b-features-pdr`
 
 .. raw:: html
@@ -303,6 +352,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-hsw-xl710-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-x710
 ~~~~~~~~~~~
 
@@ -335,6 +388,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-skx-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -353,6 +410,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-features
 ------------
 
@@ -382,6 +443,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-skx-xl710-64b-features-pdr`
 
 .. raw:: html
@@ -400,6 +465,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-skx-xl710-64b-features-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -432,6 +501,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -450,52 +523,9 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-64b-features
-------------
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: l2sw-3n-skx-xxv710-64b-features-ndr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
 .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-features-ndr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-features-ndr-tsa}
-    \end{figure}
-
-.. raw:: html
-
-    <center><b>
-
-:index:`Speedup: l2sw-3n-skx-xxv710-64b-features-pdr`
-
-.. raw:: html
-
-    </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
-    <p><br><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-features-pdr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-features-pdr-tsa}
-    \end{figure}
+    \clearpage
 
 2n-skx-x710
 ~~~~~~~~~~~
@@ -529,6 +559,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -547,6 +581,10 @@ CSIT source code for the test cases used for above plots can be found in
             \label{fig:l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
@@ -557,6 +595,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr`
 
 .. raw:: html
@@ -579,6 +621,10 @@ CSIT source code for the test cases used for above plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr`
 
 .. raw:: html

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 eecaaeb..6ff898d 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 SRv6 Routing
 ============
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: srv6-3n-hsw-x520-78b-1t1c-features-pdr`
 
 .. raw:: html

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 6902c1b..d5c1bf4 100644 (file)
--- 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
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 KVM VMs vhost-user
 ==================
 
@@ -44,6 +49,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -62,6 +71,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-base_and_scale-ip4
 ----------------------
 
@@ -91,6 +104,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -109,6 +126,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-x710
 ~~~~~~~~~~~
 
@@ -141,6 +162,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -159,6 +184,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-base_and_scale-ip4
 ----------------------
 
@@ -188,6 +217,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -206,6 +239,10 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -238,6 +275,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
@@ -256,8 +297,12 @@ CSIT source code for the test cases used for plots can be found in
             \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
 64b-base_and_scale-ip4
----------------------------
+----------------------
 
 .. raw:: html
 
@@ -285,6 +330,10 @@ CSIT source code for the test cases used for plots can be found in
 
     <center><b>
 
+.. raw:: latex
+
+    \clearpage
+
 :index:`Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html

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 bf0108c..5591c8a 100644 (file)
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts.rst
@@ -1,3 +1,8 @@
+
+.. raw:: latex
+
+    \clearpage
+
 VTS
 ===
 
@@ -15,19 +20,19 @@ CSIT source code for the test cases used for plots can be found in
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+114b-base_and_scale
+-------------------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Speedup: vts-3n-hsw-x520-64b-base_and_scale-ndr`
+:index:`Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -36,20 +41,24 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
 
 .. raw:: html
 
     <center><b>
 
-:index:`Speedup: vts-3n-hsw-x520-64b-base_and_scale-pdr`
+.. raw:: latex
+
+    \clearpage
+
+:index:`Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -58,6 +67,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}

diff --git a/resources/tools/presentation/doc/pal_lld.rst b/resources/tools/presentation/doc/pal_lld.rst
index c037f97..ebe6532 100644 (file)
--- a/resources/tools/presentation/doc/pal_lld.rst
+++ b/resources/tools/presentation/doc/pal_lld.rst
@@ -42,9 +42,10 @@ sub-layers, bottom up:
     .. raw:: latex
 
         \begin{figure}[H]
-        \centering
-            \includesvg[width=0.90\textwidth]{../_tmp/src/csit_framework_documentation/pal_layers}
-            \label{fig:pal_layers}
+            \centering
+                \graphicspath{{../_tmp/src/csit_framework_documentation/}}
+                \includegraphics[width=0.90\textwidth]{pal_layers}
+                \label{fig:pal_layers}
         \end{figure}
 
 .. only:: html
@@ -1693,9 +1694,10 @@ PAL functional diagram
     .. raw:: latex
 
         \begin{figure}[H]
-        \centering
-            \includesvg[width=0.90\textwidth]{../_tmp/src/csit_framework_documentation/pal_func_diagram}
-            \label{fig:pal_func_diagram}
+            \centering
+                \graphicspath{{../_tmp/src/csit_framework_documentation/}}
+                \includegraphics[width=0.90\textwidth]{pal_func_diagram}
+                \label{fig:pal_func_diagram}
         \end{figure}
 
 .. only:: html

diff --git a/resources/tools/presentation/generator_report.py b/resources/tools/presentation/generator_report.py
index dd200fa..2f35b66 100644 (file)
--- a/resources/tools/presentation/generator_report.py
+++ b/resources/tools/presentation/generator_report.py
@@ -264,7 +264,7 @@ def _convert_all_svg_to_pdf(path):
     :type path: str
     """
 
-    cmd = "inkscape -D -z --file={svg} --export-pdf={pdf} --export-latex"
+    cmd = "inkscape -D -z --file={svg} --export-pdf={pdf}"
 
     svg_files = get_files(path, "svg", full_path=True)
     for svg_file in svg_files:

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index fccfd92..9e80d1b 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -241,6 +241,11 @@ def table_performance_comparison(table, input_data):
                     name = "{0}-{1}".format(tst_data["parent"].split("-")[0],
                                             "-".join(tst_data["name"].
                                                      split("-")[:-1]))
+                    if "comparison across testbeds" in table["title"].lower():
+                        name = name.\
+                            replace("1t1c", "1c").replace("2t1c", "1c").\
+                            replace("2t2c", "2c").replace("4t2c", "2c").\
+                            replace("4t4c", "4c").replace("8t4c", "4c")
                     tbl_dict[tst_name_mod] = {"name": name,
                                               "ref-data": list(),
                                               "cmp-data": list()}

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 4c83a30..286ccd0 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -128,13 +128,14 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
 
     vpp-compare-testbeds:
       # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
-      # TODO: Add Data sources
+      - 19  # NDRPDR sel
       csit-vpp-perf-verify-1807-3n-skx:
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
@@ -145,12 +146,12 @@
       - 44  # NDRPDR sel
       - 49  # NDRPDR sel
       - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
       # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-hsw:
       - 9   # MRR sel
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 28  # MRR sel
       - 32  # MRR sel
@@ -160,6 +161,8 @@
       - 48  # MRR sel
       - 51  # MRR sel
       - 52  # MRR sel
+      - 53  # MRR sel
+      - 54  # MRR sel
 
     vpp-performance-changes-mrr:
       csit-vpp-perf-check-1801:
@@ -199,7 +202,6 @@
       - 41  # NDRPDR full 2
 
     vpp-perf-results-2n-skx:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-2n-skx:
       - 32  # NDRPDR full
 
@@ -221,9 +223,9 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
@@ -234,6 +236,7 @@
       - 44  # NDRPDR sel
       - 49  # NDRPDR sel
       - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1807-2n-skx:
@@ -253,9 +256,9 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-skx:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
@@ -266,6 +269,7 @@
       - 44  # NDRPDR sel
       - 49  # NDRPDR sel
       - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
 
     plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1807-2n-skx:
@@ -281,18 +285,10 @@
       - 42  # NDRPDR sel
 
     plot-vpp-http-server-performance:
-      # TODO: Add NEW Data sources
-      csit-vpp-perf-1804-all:
-      - 39  # wrk
-      - 40  # wrk
-      - 41  # wrk
-      - 42  # wrk
-      - 43  # wrk
-      - 44  # wrk
-      - 45  # wrk
-      - 46  # wrk
-      - 47  # wrk
-      - 48  # wrk
+      # TODO: Add Data sources
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 24  # WRK
+      - 25  # WRK
 
     # VPP Functional
     vpp-func-results-ubuntu:
@@ -427,11 +423,10 @@
       # TODO: Add Data sources
       - "lastSuccessfulBuild"
 
-    #NSH SFC Functional
+    # NSH SFC Functional
     nsh-func-results:
-      # TODO: Add Data sources
-      csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
-      - 7
+      csit-nsh_sfc-verify-func-1807-ubuntu1604-virl:
+      - 2
 
   plot-layouts:
 
@@ -467,7 +462,7 @@
       margin:
         t: 50
         b: 20
-        l: 50
+        l: 80
         r: 20
       showlegend: True
       legend:
@@ -507,7 +502,7 @@
       margin:
         t: 50
         b: 20
-        l: 50
+        l: 80
         r: 20
       showlegend: True
       legend:
@@ -546,7 +541,7 @@
       margin:
         t: 50
         b: 20
-        l: 50
+        l: 80
         r: 20
       showlegend: True
       legend:
@@ -585,7 +580,7 @@
       margin:
         t: 50
         b: 20
-        l: 50
+        l: 80
         r: 20
       showlegend: True
       legend:
@@ -678,16 +673,6 @@
     - 30  # sel
     - 31  # sel
     - 35  # sel
-    - 39  # wrk
-    - 40  # wrk
-    - 41  # wrk
-    - 42  # wrk
-    - 43  # wrk
-    - 44  # wrk
-    - 45  # wrk
-    - 46  # wrk
-    - 47  # wrk
-    - 48  # wrk
     # TODO: Add Data sources
     csit-vpp-perf-verify-1807-3n-hsw:
     - 8   # MRR full
@@ -695,7 +680,9 @@
     - 11  # NDRPDR full 1
     - 15  # NDRPDR sel
     - 16  # NDRPDR sel
-    # TODO: Add Data sources
+    - 19  # NDRPDR sel
+    - 24  # WRK
+    - 25  # WRK
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -706,6 +693,8 @@
     - 48  # MRR sel
     - 51  # MRR sel
     - 52  # MRR sel
+    - 53  # MRR sel
+    - 54  # MRR sel
     - 40  # NDRPDR full 1
     - 41  # NDRPDR full 2
     - 33  # NDRPDR sel
@@ -717,6 +706,7 @@
     - 44  # NDRPDR sel
     - 49  # NDRPDR sel
     - 50  # NDRPDR sel
+    - 56  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -829,9 +819,8 @@
     csit-vpp-functional-1807-centos7-virl:
     # TODO: Add Data sources
     - "lastSuccessfulBuild"
-    # TODO: Add Data sources
-    csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
-    - 7
+    csit-nsh_sfc-verify-func-1807-ubuntu1604-virl:
+    - 2
     csit-hc2vpp-verify-func-1807-ubuntu1604:
     # TODO: Add Data sources
     - "lastSuccessfulBuild"
@@ -894,6 +883,7 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -945,6 +935,7 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -996,6 +987,7 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1047,6 +1039,7 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1067,10 +1060,10 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
@@ -1081,6 +1074,7 @@
       - 44  # NDRPDR sel
       - 49  # NDRPDR sel
       - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1101,10 +1095,10 @@
       csit-vpp-perf-verify-1807-3n-hsw:
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
@@ -1115,6 +1109,7 @@
       - 44  # NDRPDR sel
       - 49  # NDRPDR sel
       - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1281,7 +1276,6 @@
   compare:
     title: "3-Node Skx"
     data:
-      # TODO: Add Data sources
       csit-vpp-perf-verify-1807-3n-skx:
       - 28  # MRR sel
       - 32  # MRR sel
@@ -1291,6 +1285,8 @@
       - 48  # MRR sel
       - 51  # MRR sel
       - 52  # MRR sel
+      - 53  # MRR sel
+      - 54  # MRR sel
   data: "vpp-compare-testbeds-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'MRR'"
@@ -3499,114 +3495,6 @@
     title: ""  # No title
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
 # Packet Throughput - VPP L2 2n-skx-x710
 -
   type: "plot"
@@ -5197,15 +5085,15 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-xxv710
+# Packet Throughput - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  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-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -5226,12 +5114,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  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-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -5252,12 +5140,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  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-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -5278,12 +5166,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  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-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -5302,17 +5190,17 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-ndr"
+  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-3n-skx-xxv710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -5331,15 +5219,14 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-pdr"
+  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-3n-skx-xxv710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -5358,15 +5245,14 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-ndr"
+  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-3n-skx-xxv710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -5385,15 +5271,14 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-pdr"
+  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-3n-skx-xxv710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -5410,22 +5295,24 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-x710
+################################################################################
+
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-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-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
@@ -5439,19 +5326,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-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-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
@@ -5465,19 +5352,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-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-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
@@ -5491,19 +5378,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-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-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
@@ -5515,222 +5402,10 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-xxv710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710
 -
   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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  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"
@@ -6048,17 +5723,17 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-features-ndr"
+  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-x520-78b-1t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
@@ -6078,15 +5753,14 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-features-pdr"
+  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-x520-78b-1t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
@@ -6106,19 +5780,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-features-ndr"
+  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-x520-78b-2t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           not 'SRv6' and
            'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -6134,15 +5807,14 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-features-pdr"
+  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-x520-78b-2t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
@@ -6160,15 +5832,15 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x710
+# Packet Throughput - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6190,12 +5862,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6217,12 +5889,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6244,12 +5916,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6269,19 +5941,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-features-ndr"
+  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-hsw-x710-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6299,17 +5971,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-features-pdr"
+  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-hsw-x710-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6327,17 +5998,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-features-ndr"
+  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-hsw-x710-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6355,17 +6025,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-features-pdr"
+  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-hsw-x710-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6381,19 +6050,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
+# Packet Throughput - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  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-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6411,18 +6080,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  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-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
-           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -6438,16 +6106,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  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-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6465,16 +6133,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  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-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -6490,15 +6158,15 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710
+# Packet Throughput - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  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-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6520,12 +6188,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  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-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6547,12 +6215,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  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-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6574,12 +6242,12 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  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-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -6599,22 +6267,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+################################################################################
+
+# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-features-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '1T1C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6629,20 +6297,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-features-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '1T1C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6657,20 +6322,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '2T2C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6685,20 +6347,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '2T2C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6711,22 +6370,23 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-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-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6741,19 +6401,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-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-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6768,19 +6427,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-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-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6795,21 +6453,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-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-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
   - "throughput"
   - "parent"
   traces:
@@ -6820,23 +6477,23 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+################################################################################
+
+# Packet Throughput - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
@@ -6850,21 +6507,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
@@ -6878,21 +6532,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
@@ -6906,21 +6557,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
@@ -6932,23 +6580,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-x710
+################################################################################
+
+# Packet Throughput - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  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]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -6962,19 +6609,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  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]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -6988,20 +6633,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  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]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7015,20 +6657,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  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]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7040,23 +6679,23 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7070,20 +6709,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-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-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7097,20 +6736,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-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-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7124,20 +6763,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7149,23 +6788,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Throughput - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  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]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7179,18 +6815,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  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]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7204,18 +6839,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  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]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7229,18 +6863,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  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]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7252,24 +6885,23 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7283,19 +6915,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7309,19 +6942,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7335,19 +6969,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7359,23 +6994,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
+# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7389,18 +7021,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7414,18 +7045,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7439,18 +7069,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -7462,22 +7091,23 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7491,17 +7121,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7515,17 +7148,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7539,17 +7175,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -7561,23 +7200,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+################################################################################
+
+# Packet Throughput - VPP VTS 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VTS'"
   parameters:
   - "throughput"
   - "parent"
@@ -7591,20 +7228,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VTS'"
   parameters:
   - "throughput"
   - "parent"
@@ -7618,20 +7251,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VTS'"
   parameters:
   - "throughput"
   - "parent"
@@ -7645,20 +7274,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VTS'"
   parameters:
   - "throughput"
   - "parent"
@@ -7670,20 +7295,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
+################################################################################
+
+# Packet Throughput - DPDK l3fwd 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-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-latency-3n-hsw"
-  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
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7697,17 +7324,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-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-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7721,17 +7348,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-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-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7745,17 +7372,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-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-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7767,23 +7394,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+# Packet Throughput - DPDK l3fwd 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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
            '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7797,20 +7421,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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
            '64B' and
+           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7824,20 +7445,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-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
            '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7851,20 +7469,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7876,20 +7491,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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
            '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7903,17 +7518,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7927,17 +7542,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7951,17 +7566,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -7973,23 +7588,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
+# Packet Throughput - DPDK l3fwd 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8003,20 +7615,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8030,20 +7639,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8057,20 +7663,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8082,21 +7685,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP VTS 3n-hsw-x520
+# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-64b-1t1c-ndr"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-1t1c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           '1T1C' and
-           'VTS'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8110,16 +7712,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-64b-2t2c-ndr"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-2t2c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           '2T2C' and
-           'VTS'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8133,16 +7736,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-64b-1t1c-pdr"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-1t1c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           '1T1C' and
-           'VTS'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8156,16 +7760,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-64b-2t2c-pdr"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-2t2c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           '2T2C' and
-           'VTS'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -8177,21 +7782,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x520
+# Packet Throughput - DPDK l3fwd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  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-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           '1T1C' and
+           '2T1C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8206,16 +7809,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  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-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8230,16 +7833,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  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-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8254,16 +7857,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  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-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8276,19 +7879,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-x710
+# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  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-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8303,16 +7906,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  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-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8327,16 +7930,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  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-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8351,16 +7954,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  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-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
-           '2T2C' and
+           '4T2C' and
            'IP4FWD'"
   parameters:
   - "throughput"
@@ -8373,20 +7976,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
+################################################################################
+
+# Packet Throughput - DPDK testpmd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-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"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8400,17 +8005,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-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"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8424,17 +8029,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-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"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8448,17 +8053,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-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"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8470,20 +8075,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-x710
+# Packet Throughput - DPDK testpmd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-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"
+  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
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8497,17 +8102,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-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"
+  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
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8521,17 +8126,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-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"
+  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
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8545,17 +8150,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-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"
+  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
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8567,20 +8172,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
+# Packet Throughput - DPDK testpmd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-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
+  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
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8594,17 +8199,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-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
+  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
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8618,17 +8223,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-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
+  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
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8642,17 +8247,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-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
+  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
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8664,20 +8269,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-x710
+# Packet Throughput - DPDK testpmd 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8691,17 +8296,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8715,17 +8320,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8739,17 +8344,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8761,20 +8366,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
+# Packet Throughput - DPDK testpmd 3n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8788,17 +8393,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8812,17 +8417,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8836,17 +8441,17 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "DPDK Throughput: testpmd-3n-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"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8858,21 +8463,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x520
+# Packet Throughput - DPDK testpmd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  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-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -8887,16 +8490,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  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-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -8911,16 +8514,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  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-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -8935,16 +8538,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  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-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -8957,19 +8560,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-x710
+# Packet Throughput - DPDK testpmd 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  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-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  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
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -8984,16 +8587,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  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-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -9008,16 +8611,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  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-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -9032,16 +8635,16 @@
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  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-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
@@ -9054,1482 +8657,154 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-xl710
+
+
+
+
+
+
+
+################################################################################
+
+# Packet Latency - VPP L2 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
-    layout: "plot-throughput"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
-    layout: "plot-throughput"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
-    layout: "plot-throughput"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
-    layout: "plot-throughput"
+    layout: "plot-latency"
 
-# Packet Throughput - DPDK testpmd 3n-skx-x710
+# Packet Latency - VPP L2 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_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"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
-    layout: "plot-throughput"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-
-
-
-
-
-
-
-################################################################################
-
-# Packet Latency - VPP L2 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-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') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-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') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' 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"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' 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"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' 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"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' 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"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-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') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-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') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-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') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-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') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP IPv4 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10541,10 +8816,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10552,9 +8827,9 @@
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10566,10 +8841,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10577,9 +8852,9 @@
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10589,22 +8864,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-xl710
+# Packet Latency - VPP L2 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10616,19 +8891,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10638,22 +8913,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710
+# Packet Latency - VPP L2 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10665,19 +8940,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10689,10 +8964,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10700,9 +8975,9 @@
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10714,10 +8989,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10725,9 +9000,9 @@
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10737,22 +9012,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-xxv710
+# Packet Latency - VPP L2 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10764,19 +9039,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10786,22 +9061,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
+# Packet Latency - VPP L2 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10813,20 +9088,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10836,22 +9110,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-x710
+# Packet Latency - VPP L2 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10863,19 +9137,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10885,22 +9159,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-xxv710
+################################################################################
+
+# Packet Latency - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10912,19 +9188,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -10934,26 +9210,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
+# Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -10963,21 +9237,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -10985,24 +9259,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
+# Packet Latency - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -11012,21 +9286,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -11034,24 +9308,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
+# Packet Latency - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -11061,21 +9335,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -11085,23 +9359,22 @@
 
 ################################################################################
 
-# Packet Latency - VPP IPv6 3n-hsw-x520
+# Packet Latency - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -11113,20 +9386,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -11136,23 +9408,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
+# Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -11164,21 +9435,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -11188,21 +9457,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-hsw-x710
+################################################################################
+
+# Packet Latency - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11216,18 +9486,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11241,19 +9510,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11267,19 +9535,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11291,21 +9558,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-hsw-xl710
+# Packet Latency - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11319,18 +9585,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11342,21 +9607,20 @@
     title: ""  # No title
     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"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '1T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11370,18 +9634,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11393,21 +9657,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
+# Packet Latency - VPP IPv4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '1T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11421,19 +9684,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11445,21 +9706,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 3n-skx-xxv710
+# Packet Latency - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11473,18 +9733,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11498,19 +9757,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11524,19 +9782,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11548,21 +9805,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-x710
+# Packet Latency - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11576,18 +9832,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11599,21 +9854,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-xxv710
+# Packet Latency - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11627,18 +9881,17 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11652,23 +9905,24 @@
 
 ################################################################################
 
-# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+           '64B' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   traces:
     boxmean: False
@@ -11678,20 +9932,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+           '64B' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   traces:
     boxmean: False
@@ -11699,26 +9954,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP IPSec 3n-hsw-xl710
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   traces:
     boxmean: False
@@ -11728,21 +9981,70 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: ""  # No title
+    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_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T1C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: ""  # No title
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '4T2C' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
   - "parent"
   traces:
     boxmean: False
@@ -11752,21 +10054,23 @@
 
 ################################################################################
 
-# Packet Latency - VPP SRv6 3n-hsw-x520
+# Packet Latency - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11778,18 +10082,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
-           'FEATURE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11799,22 +10105,74 @@
     title: ""  # No title
     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_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: ""  # No title
+    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"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: ""  # No title
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 3n-hsw-xl710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11826,17 +10184,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11846,23 +10207,23 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
+# Packet Latency - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11874,20 +10235,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11897,20 +10258,23 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x710
+# Packet Latency - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11922,17 +10286,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11942,23 +10309,23 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710
+# Packet Latency - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11970,20 +10337,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -11993,20 +10360,23 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-xl710
+################################################################################
+
+# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -12018,17 +10388,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -12038,23 +10409,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+################################################################################
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -12066,20 +10438,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -12091,19 +10462,21 @@
 
 ################################################################################
 
-# Packet Latency - VPP VTS 3n-hsw-x520
+# Packet Latency - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-64b-1t1c-ndr-lat"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-1t1c-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            '1T1C' and
-           'VTS'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "latency"
   - "parent"
@@ -12115,16 +10488,18 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-64b-2t2c-ndr-lat"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-2t2c-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            '2T2C' and
-           'VTS'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "latency"
   - "parent"
@@ -12133,368 +10508,358 @@
   layout:
     title: ""  # No title
     layout: "plot-latency"
-    
+
 ################################################################################
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x520
+# Packet Latency - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x710
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-xl710
+# Packet Latency - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-skx-x710
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-skx-xxv710
+# Packet Latency - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/ip4-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 2n-skx-x710
+# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 2n-skx-xxv710
+################################################################################
+
+# Packet Latency - VPP VTS 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VTS'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
   algorithm: "plot_latency_box"
   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
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VTS'"
   parameters:
   - "latency"
   - "parent"
   traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+    boxmean: False
   layout:
     title: ""  # No title
     layout: "plot-latency"
-
+    
 ################################################################################
 
-# Packet Latency - DPDK testpmd 3n-hsw-x520
+# Packet Latency - DPDK l3fwd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12508,17 +10873,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12530,20 +10895,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x710
+# Packet Latency - DPDK l3fwd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12557,17 +10922,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12579,20 +10944,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-hsw-xl710
+# Packet Latency - DPDK l3fwd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12606,17 +10971,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12628,20 +10993,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-skx-x710
+# Packet Latency - DPDK l3fwd 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12655,17 +11020,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12677,20 +11042,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-skx-xxv710
+# Packet Latency - DPDK l3fwd 3n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12704,17 +11069,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12726,20 +11091,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 2n-skx-x710
+# Packet Latency - DPDK l3fwd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12753,17 +11118,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12775,20 +11140,20 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 2n-skx-xxv710
+# Packet Latency - DPDK l3fwd 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12802,17 +11167,17 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -12826,340 +11191,366 @@
 
 ################################################################################
 
-# Speedup - VPP Container Memif 3n-hsw-x520
+# Packet Latency - DPDK testpmd 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
+# Packet Latency - DPDK testpmd 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
-# Speedup - VPP Container Memif 3n-hsw-xl710
+# Packet Latency - DPDK testpmd 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
-# Speedup - VPP Container Memif 3n-skx-x710
+# Packet Latency - DPDK testpmd 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-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
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-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
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-            'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    layout: "plot-latency"
 
-# Speedup - VPP Container k8s memif 3n-hsw-x520
+# Packet Latency - DPDK testpmd 3n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
+# Packet Latency - DPDK testpmd 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-hsw-x520
+# Packet Latency - DPDK testpmd 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-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_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
+
+################################################################################
 
+# Speedup - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  title: "Speedup: memif-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-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13170,19 +11561,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  title: "Speedup: memif-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-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13191,21 +11581,21 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710
+# Speedup - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13216,18 +11606,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13236,21 +11626,21 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-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-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13261,19 +11651,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-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-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13282,21 +11671,21 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-xl710
+# Speedup - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-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-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13307,18 +11696,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-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-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13327,21 +11716,23 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710
+################################################################################
+
+# Speedup - VPP Container k8s memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: k8s-memif-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-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13352,18 +11743,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: k8s-memif-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-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13372,21 +11763,21 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
+  title: "Speedup: k8s-memif-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-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13397,19 +11788,18 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
+  title: "Speedup: k8s-memif-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-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -13418,15 +11808,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-xxv710
+################################################################################
+
+# Speedup - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -13443,12 +11835,12 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  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-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -13465,12 +11857,12 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-xxv710-64b-features-ndr-tsa"
+  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-skx-xxv710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -13488,12 +11880,12 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-xxv710-64b-features-pdr-tsa"
+  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-skx-xxv710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -13509,14 +11901,14 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-x710
+# Speedup - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  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-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -13534,11 +11926,11 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -13554,17 +11946,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13579,14 +11971,15 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  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-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13599,20 +11992,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520
+# Speedup - VPP IPv4 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13627,15 +12017,14 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13648,18 +12037,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
+# Speedup - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  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]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13674,15 +12062,14 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  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]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13695,18 +12082,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13721,15 +12107,15 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13742,18 +12128,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710
+# Speedup - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  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]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13768,15 +12153,14 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  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]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -13789,22 +12173,19 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv6 3n-hsw-x520
+# Speedup - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  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]}/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13817,17 +12198,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  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]}/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13838,20 +12218,22 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Speedup - VPP IPv4 Tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-features-ndr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13864,18 +12246,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-features-pdr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13886,20 +12267,20 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-hsw-x710
+# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  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]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13912,17 +12293,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  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]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13933,20 +12314,20 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv4 Tunnels 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-features-ndr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13959,18 +12340,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-features-pdr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13981,20 +12361,20 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-hsw-xl710
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+  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]}/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -14007,17 +12387,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
+  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]}/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -14028,15 +12408,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-skx-x710
+################################################################################
+
+# Speedup - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -14054,12 +12436,12 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -14075,17 +12457,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-features-ndr-tsa"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -14101,15 +12483,14 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-features-pdr-tsa"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -14123,15 +12504,15 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-skx-xxv710
+# Speedup - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -14149,12 +12530,12 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -14170,17 +12551,17 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-features-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -14196,15 +12577,14 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-features-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -14813,52 +13193,6 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP L2 2n-skx-x710
 -
   type: "plot"
@@ -15218,13 +13552,13 @@
 # Speedup - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            'VTS'"
   parameters:
@@ -15237,13 +13571,13 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '114B' and
            'NDRPDR' and
            'VTS'"
   parameters: