From 9d324eab35857dac39015da42ce4e7cd3554ffaf Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 6 Aug 2019 14:15:39 +0200
Subject: [PATCH] Report 1904.2: Configuration

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I1bf1903208e147df41d15caee21bf1bd70d91b9a
---
 .../vpp_performance_results/index.rst              |     2 +-
 docs/report/index.html.template                    |     2 +-
 docs/report/index.pdf.template                     |     2 +-
 docs/report/introduction/report_history.rst        |     4 +-
 .../vpp_performance_configuration/index.rst        |     2 +-
 .../vpp_performance_operational_data/index.rst     |     2 +-
 .../comparisons/current_vs_previous_release.rst    |    35 +-
 .../vpp_performance_tests/csit_release_notes.rst   |     2 +-
 .../packet_latency_graphs/index.rst                |     2 +-
 .../packet_latency_graphs/ip4-3n-skx-x710.rst      |     1 +
 .../packet_latency_graphs/ip4.rst                  |     3 +-
 .../ipsec-3n-skx-x710.rst}                         |    83 +-
 .../packet_latency_graphs/ipsec.rst                |     2 +-
 .../packet_latency_graphs/l2.rst                   |     2 +-
 .../packet_throughput_graphs/index.rst             |     4 +-
 .../packet_throughput_graphs/ip4.rst               |     2 +-
 .../ipsec-3n-hsw-xl710.rst                         |   286 -
 .../ipsec-3n-skx-x710.rst}                         |   102 +-
 .../packet_throughput_graphs/ipsec.rst             |     2 +-
 .../packet_throughput_graphs/l2.rst                |     2 +-
 .../throughput_speedup_multi_core/index.rst        |     6 +-
 .../throughput_speedup_multi_core/ip4.rst          |     2 +-
 .../ipsec-3n-skx-x710.rst                          |   114 +
 .../throughput_speedup_multi_core/ipsec.rst        |     2 +-
 .../throughput_speedup_multi_core/l2.rst           |     2 +-
 .../vm_vhost-3n-skx-x710.rst                       |    87 -
 resources/tools/presentation/conf.py               |    12 +-
 resources/tools/presentation/input_data_parser.py  |    99 +-
 resources/tools/presentation/run_report.sh         |     2 +-
 resources/tools/presentation/specification.yaml    | 23418 ++-----------------
 30 files changed, 2849 insertions(+), 21437 deletions(-)
 rename docs/report/vpp_performance_tests/{throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst => packet_latency_graphs/ipsec-3n-skx-x710.rst} (54%)
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
 rename docs/report/vpp_performance_tests/{packet_latency_graphs/ipsec-3n-hsw-xl710.rst => packet_throughput_graphs/ipsec-3n-skx-x710.rst} (52%)
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-x710.rst

diff --git a/docs/report/detailed_test_results/vpp_performance_results/index.rst b/docs/report/detailed_test_results/vpp_performance_results/index.rst
index bf89346894..4332700fe7 100644
--- a/docs/report/detailed_test_results/vpp_performance_results/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results/index.rst
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
-    ../vpp_performance_results_3n_hsw/index
     ../vpp_performance_results_3n_skx/index
 
 ..
+    ../vpp_performance_results_3n_hsw/index
     ../vpp_performance_results_2n_skx/index
     ../vpp_performance_results_2n_dnv/index
diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index cc757c671c..94dee7b70a 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -1,4 +1,4 @@
-CSIT-1901.2
+CSIT-1904.2
 ===========
 
 .. toctree::
diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template
index 9302af808c..0488248821 100644
--- a/docs/report/index.pdf.template
+++ b/docs/report/index.pdf.template
@@ -1,4 +1,4 @@
-CSIT-1901.2
+CSIT-1904.2
 ===========
 
 .. toctree::
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 65c54351bc..df92c17347 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -1,12 +1,12 @@
 Report History
 ==============
 
-FD.io CSIT-1904.1 Report history and per .[ww] revision changes are listed below.
+FD.io CSIT-1904.2 Report history and per .[ww] revision changes are listed below.
 
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
-| .24            | Initial version                                            |
+| .32            | Initial version                                            |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
 
diff --git a/docs/report/test_configuration/vpp_performance_configuration/index.rst b/docs/report/test_configuration/vpp_performance_configuration/index.rst
index 4584a15588..f51245d9f2 100644
--- a/docs/report/test_configuration/vpp_performance_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration/index.rst
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
-    ../vpp_performance_configuration_3n_hsw/index
     ../vpp_performance_configuration_3n_skx/index
 
 ..
+    ../vpp_performance_configuration_3n_hsw/index
     ../vpp_performance_configuration_2n_dnv/index
     ../vpp_performance_configuration_2n_skx/index
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
index ff8009dd4d..bad21ea630 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
-    ../vpp_performance_operational_data_3n_hsw/index
     ../vpp_performance_operational_data_3n_skx/index
 
 ..
+    ../vpp_performance_operational_data_3n_hsw/index
     ../vpp_performance_operational_data_2n_dnv/index
     ../vpp_performance_operational_data_2n_skx/index
diff --git a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
index e13cac308e..fdeab94d34 100644
--- a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
+++ b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
@@ -30,30 +30,31 @@ results repeatability vary between the test cases.
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-3n-hsw
-~~~~~~
+..
+    3n-hsw
+    ~~~~~~
 
-NDR Comparison
-``````````````
+    NDR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.txt>`_
-  - `ASCII 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.txt>`_
-  - `CSV 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.csv>`_
-  - `CSV 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.csv>`_
+      - `ASCII 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.txt>`_
+      - `ASCII 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.txt>`_
+      - `CSV 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.csv>`_
+      - `CSV 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.csv>`_
 
-PDR Comparison
-``````````````
+    PDR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
+
+      - `ASCII 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.txt>`_
+      - `ASCII 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.txt>`_
+      - `CSV 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.csv>`_
+      - `CSV 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.csv>`_
 
-  - `ASCII 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.txt>`_
-  - `ASCII 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.txt>`_
-  - `CSV 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.csv>`_
-  - `CSV 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.csv>`_
 
-..
     MRR Comparison
     ``````````````
 
diff --git a/docs/report/vpp_performance_tests/csit_release_notes.rst b/docs/report/vpp_performance_tests/csit_release_notes.rst
index 6cf529e786..e60e50bcf9 100644
--- a/docs/report/vpp_performance_tests/csit_release_notes.rst
+++ b/docs/report/vpp_performance_tests/csit_release_notes.rst
@@ -51,7 +51,7 @@ Release Notes
 .. note::
 
     |csit-release| report was generated with a single run of selected
-    64B frame performance tests on 3n-hsw and 3n-skx test beds
+    64B frame performance tests on 3n-skx test bed
     in order to spot-check the main data plane paths.
     NFV service density and soak tests were not run and do not feature in
     this report.
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
index 46cac66468..11367c9364 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
@@ -54,9 +54,9 @@ Additional information about graph data:
     vm_vhost
     container_memif
     ipsec
-    srv6
 
 ..
+    srv6
     ip6_tunnels
     container_orchestrated
     vts
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
index 9ea15c2ecd..b5b52283e5 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-x710.rst
@@ -73,6 +73,7 @@
             \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
+
 .. raw:: latex
 
     \clearpage
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 1c71d9949a..79a2a00dd5 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
@@ -17,9 +17,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ip4-3n-hsw-x520
     ip4-3n-skx-x710
+
 ..
+    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-2n-skx-x710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-x710.rst
similarity index 54%
rename from docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
rename to docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-x710.rst
index cd454bf81e..d1b1005ec4 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-skx-x710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-hsw-xl710
-~~~~~~~~~~~~
+3n-skx-x710
+~~~~~~~~~~~
 
-64b-hw-base
------------
+64b-2t1c-sw-int
+---------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,41 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-base-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr-lat}
+            \label{fig:ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-base-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-base-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-base-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-hw-scale
-------------
+64b-4t2c-sw-int
+---------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,41 +69,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-scale-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr-lat}
+            \label{fig:ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-scale-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-sw-base
------------
+64b-2t1c-sw-tnl
+---------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa.html"></iframe>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,18 +92,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-sw-ndr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-sw-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr-lat}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+64b-4t2c-sw-tnl
+---------------
+
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa.html"></iframe>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,6 +115,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-sw-pdr-tsa}
-            \label{fig:ipsec-3n-hsw-xl710-64b-sw-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr-lat}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
index 84c831c78e..75f1291278 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
@@ -20,4 +20,4 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ipsec-3n-hsw-xl710
+    ipsec-3n-skx-x710
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 ac907407be..66b1fa44e2 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -43,10 +43,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
+    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index 252f67043e..91102921f5 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -64,9 +64,9 @@ Additional information about graph data:
     vm_vhost
     container_memif
     ipsec
-    srv6
-    vts
 
 ..
+    srv6
+    vts
     ip6_tunnels
     container_orchestrated
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 32592d41a5..47facdc175 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -17,10 +17,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ip4-3n-hsw-x520
     ip4-3n-skx-x710
 
 ..
+    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-2n-skx-x710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
deleted file mode 100644
index 77bc77c8d7..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
+++ /dev/null
@@ -1,286 +0,0 @@
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <script type="text/javascript">
-
-        function getDocHeight(doc) {
-            doc = doc || document;
-            var body = doc.body, html = doc.documentElement;
-            var height = Math.max( body.scrollHeight, body.offsetHeight,
-                html.clientHeight, html.scrollHeight, html.offsetHeight );
-            return height;
-        }
-
-        function setIframeHeight(id) {
-            var ifrm = document.getElementById(id);
-            var doc = ifrm.contentDocument? ifrm.contentDocument:
-                ifrm.contentWindow.document;
-            ifrm.style.visibility = 'hidden';
-            ifrm.style.height = "10px"; // reset to minimal height ...
-            // IE opt. for bing/msn needs a bit added or scrollbar appears
-            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
-            ifrm.style.visibility = 'visible';
-        }
-
-    </script>
-
-3n-hsw-xl710
-~~~~~~~~~~~~
-
-64b-1t1c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base
--------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-scale
---------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-scale
---------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-1t1c-sw
------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-sw
------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-x710.rst
similarity index 52%
rename from docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst
rename to docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-x710.rst
index ac40ebedb4..812424e2d9 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-x710.rst
@@ -28,16 +28,16 @@
 
     </script>
 
-3n-hsw-xl710
-~~~~~~~~~~~~
+3n-skx-x710
+~~~~~~~~~~~
 
-64b-1t1c-base
---------------
+64b-2t1c-sw-int
+---------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr}
+            \label{fig:ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base
--------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr}
+            \label{fig:ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-scale
---------------
+64b-4t2c-sw-int
+---------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -92,21 +89,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr}
+            \label{fig:ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-scale
---------------
-
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -115,21 +109,41 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr}
+            \label{fig:ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-sw
------------
+64b-2t1c-sw-tnl
+---------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat.html"></iframe>
+    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +152,41 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-sw
------------
+64b-4t2c-sw-tnl
+---------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat.html"></iframe>
+    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,6 +195,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index c09be78a0b..8b0f95d966 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -45,4 +45,4 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ipsec-3n-hsw-xl710
+    ipsec-3n-skx-x710
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 2695ffe9da..35f657f8df 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -42,10 +42,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
+    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
index b1b1ebc416..d07013e40f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
@@ -52,11 +52,11 @@ Additional information about graph data:
     ip6
     ip4_tunnels
     container_memif
+    vm_vhost
     ipsec
-    srv6
-    vts
 
 ..
-    vm_vhost
+    srv6
+    vts
     ip6_tunnels
     container_orchestrated
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 1a5d32813c..22ca300fa4 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -19,10 +19,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ip4-3n-hsw-x520
     ip4-3n-skx-x710
 
 ..
+    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-3n-skx-x710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-x710.rst
new file mode 100644
index 0000000000..961b47ae7f
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-x710.rst
@@ -0,0 +1,114 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-sw-base-int
+---------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-sw-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-sw-ndr-tsa}
+            \label{fig:ipsec-int-3n-skx-x710-64b-sw-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-int-3n-skx-x710-64b-sw-pdr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-int-3n-skx-x710-64b-sw-pdr-tsa}
+            \label{fig:ipsec-int-3n-skx-x710-64b-sw-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-sw-base-tnl
+---------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-sw-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-sw-ndr-tsa}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-sw-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-tnl-3n-skx-x710-64b-sw-pdr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-tnl-3n-skx-x710-64b-sw-pdr-tsa}
+            \label{fig:ipsec-tnl-3n-skx-x710-64b-sw-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index d612a8acce..931e09a3e9 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -21,4 +21,4 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    ipsec-3n-hsw-xl710
+    ipsec-3n-skx-x710
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 cd78d5addd..327fd6850e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -19,10 +19,10 @@ CSIT source code for the test cases used for above plots can be found in
 
 .. toctree::
 
-    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
+    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
index 258c880c1b..3479c4ab53 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
@@ -31,93 +31,6 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_features-l2sw
---------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-base_and_features-vm-l2sw
-    -----------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
-
-    .. raw:: latex
-
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
-                \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 64b-base_and_scale-ip4
 ----------------------
 
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index dc9e6d710a..9f4a412308 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -45,8 +45,8 @@ source_suffix = ['.rst', '.md']
 master_doc = 'index'
 
 # General information about the project.
-report_week = '24'
-project = u'FD.io CSIT-1904.1.{week}'.format(week=report_week)
+report_week = '32'
+project = u'FD.io CSIT-1904.2.{week}'.format(week=report_week)
 copyright = u'2019, FD.io'
 author = u'FD.io CSIT'
 
@@ -109,13 +109,13 @@ rst_epilog = """
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
 .. _K8s configuration files: https://github.com/FDio/csit/tree/{release}/resources/templates/kubernetes
 .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id}
-""".format(release='rls1904_1',
+""".format(release='rls1904_2',
            report_week=report_week,
            prev_release='rls1901',
-           srelease='1904_1',
-           csitrelease='1904.1',
+           srelease='1904_2',
+           csitrelease='1904.2',
            csit_prev_release='1901',
-           vpprelease='19.04.1',
+           vpprelease='19.04.2',
            vpp_prev_release='19.01',
            dpdkrelease='19.02',
            sdpdkrelease='1902',
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 84245c429c..3b3be9f1cd 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -19,9 +19,8 @@
 - filter the data using tags,
 """
 
-import multiprocessing
-import os
 import re
+import resource
 import pandas as pd
 import logging
 
@@ -37,7 +36,6 @@ from json import loads
 from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory
 
 from input_data_files import download_and_unzip_data_file
-from utils import Worker
 
 
 # Separator used in file names
@@ -1187,13 +1185,10 @@ class InputData(object):
 
         return checker.data
 
-    def _download_and_parse_build(self, pid, data_queue, job, build, repeat):
+    def _download_and_parse_build(self, job, build, repeat, pid=10000):
         """Download and parse the input data file.
 
         :param pid: PID of the process executing this method.
-        :param data_queue: Shared memory between processes. Queue which keeps
-            the result data. This data is then read by the main process and used
-            in further processing.
         :param job: Name of the Jenkins job which generated the processed input
             file.
         :param build: Information about the Jenkins build which generated the
@@ -1201,7 +1196,6 @@ class InputData(object):
         :param repeat: Repeat the download specified number of times if not
             successful.
         :type pid: int
-        :type data_queue: multiprocessing.Manager().Queue()
         :type job: str
         :type build: dict
         :type repeat: int
@@ -1266,11 +1260,11 @@ class InputData(object):
                         file_name = self._cfg.input["file-name"]
                         full_name = join(
                             self._cfg.environment["paths"]["DIR[WORKING,DATA]"],
-                            "{job}{sep}{build}{sep}{name}".
-                                format(job=job,
-                                       sep=SEPARATOR,
-                                       build=build["build"],
-                                       name=file_name))
+                            "{job}{sep}{build}{sep}{name}".format(
+                                job=job,
+                                sep=SEPARATOR,
+                                build=build["build"],
+                                name=file_name))
                         try:
                             remove(full_name)
                             logs.append(("INFO",
@@ -1278,8 +1272,8 @@ class InputData(object):
                                          format(name=full_name)))
                         except OSError as err:
                             logs.append(("ERROR",
-                                        "Cannot remove the file '{0}': {1}".
-                                        format(full_name, repr(err))))
+                                         "Cannot remove the file '{0}': {1}".
+                                         format(full_name, repr(err))))
         logs.append(("INFO", "  Done."))
 
         for level, line in logs:
@@ -1294,13 +1288,7 @@ class InputData(object):
             elif level == "WARNING":
                 logging.warning(line)
 
-        result = {
-            "data": data,
-            "state": state,
-            "job": job,
-            "build": build
-        }
-        data_queue.put(result)
+        return {"data": data, "state": state, "job": job, "build": build}
 
     def download_and_parse_data(self, repeat=1):
         """Download the input data files, parse input data from input files and
@@ -1313,61 +1301,34 @@ class InputData(object):
 
         logging.info("Downloading and parsing input files ...")
 
-        work_queue = multiprocessing.JoinableQueue()
-        manager = multiprocessing.Manager()
-        data_queue = manager.Queue()
-        cpus = multiprocessing.cpu_count()
-
-        workers = list()
-        for cpu in range(cpus):
-            worker = Worker(work_queue,
-                            data_queue,
-                            self._download_and_parse_build)
-            worker.daemon = True
-            worker.start()
-            workers.append(worker)
-            os.system("taskset -p -c {0} {1} > /dev/null 2>&1".
-                      format(cpu, worker.pid))
-
         for job, builds in self._cfg.builds.items():
             for build in builds:
-                work_queue.put((job, build, repeat))
-
-        work_queue.join()
-
-        logging.info("Done.")
-
-        while not data_queue.empty():
-            result = data_queue.get()
-
-            job = result["job"]
-            build_nr = result["build"]["build"]
 
-            if result["data"]:
-                data = result["data"]
-                build_data = pd.Series({
-                    "metadata": pd.Series(data["metadata"].values(),
-                                          index=data["metadata"].keys()),
-                    "suites": pd.Series(data["suites"].values(),
-                                        index=data["suites"].keys()),
-                    "tests": pd.Series(data["tests"].values(),
-                                       index=data["tests"].keys())})
+                result = self._download_and_parse_build(job, build, repeat)
+                build_nr = result["build"]["build"]
 
-                if self._input_data.get(job, None) is None:
-                    self._input_data[job] = pd.Series()
-                self._input_data[job][str(build_nr)] = build_data
+                if result["data"]:
+                    data = result["data"]
+                    build_data = pd.Series({
+                        "metadata": pd.Series(
+                            data["metadata"].values(),
+                            index=data["metadata"].keys()),
+                        "suites": pd.Series(data["suites"].values(),
+                                            index=data["suites"].keys()),
+                        "tests": pd.Series(data["tests"].values(),
+                                           index=data["tests"].keys())})
 
-                self._cfg.set_input_file_name(job, build_nr,
-                                              result["build"]["file-name"])
+                    if self._input_data.get(job, None) is None:
+                        self._input_data[job] = pd.Series()
+                    self._input_data[job][str(build_nr)] = build_data
 
-            self._cfg.set_input_state(job, build_nr, result["state"])
+                    self._cfg.set_input_file_name(
+                        job, build_nr, result["build"]["file-name"])
 
-        del data_queue
+                self._cfg.set_input_state(job, build_nr, result["state"])
 
-        # Terminate all workers
-        for worker in workers:
-            worker.terminate()
-            worker.join()
+                logging.info("Memory allocation: {0:,d}MB".format(
+                    resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000))
 
         logging.info("Done.")
 
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 23ffad796d..2b8fda6193 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,7 +38,7 @@ export PYTHONPATH=`pwd`
 python pal.py \
     --specification specification.yaml \
     --release ${RELEASE} \
-    --week "24" \
+    --week "32" \
     --logging INFO \
     --force
 
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 9e2edcddef..ff04c8a5a5 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -129,8 +129,8 @@
 
     # 3n-hsw
 
-    plot-vpp-throughput-lat-tsa-3n-hsw:
-      csit-vpp-perf-verify-1904-3n-hsw:
+#    plot-vpp-throughput-lat-tsa-3n-hsw:
+#      csit-vpp-perf-verify-1904-3n-hsw:
 #        - 11  # NDRPDR sel
 #        - 12  # NDRPDR sel
 #        - 20  # NDRPDR sel
@@ -141,7 +141,7 @@
 #        - 26  # NDRPDR sel
 #        - 29  # NDRPDR sel
 #        - 30  # NDRPDR sel
-        - 55  # 1904.1 NDRPDR sel
+#        - 55  # 1904.1 NDRPDR sel
 
 #    plot-vpp-http-server-performance:
 #      # csit-vpp-perf-verify-1904-3n-hsw:
@@ -198,7 +198,7 @@
 #        - 21  # NDRPDR sel
 #        - 23  # NDRPDR sel
 #        - 25  # NDRPDR sel
-        - 37  # 1904.1 NDRPDR sel
+        - 38  # 1904.2 NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1904-3n-skx:
@@ -364,8 +364,8 @@
 
     # Results
 
-    vpp-perf-results-3n-hsw:
-      csit-vpp-perf-verify-1904-3n-hsw:
+#    vpp-perf-results-3n-hsw:
+#      csit-vpp-perf-verify-1904-3n-hsw:
 #        - 32  # NDRPDR full
 #        - 33  # NDRPDR full
 #        - 35  # NDRPDR full
@@ -380,7 +380,7 @@
 #        - 50  # NDRPDR full
 #        - 51  # NDRPDR full
 #        - 52  # NDRPDR full
-        - 55  # 1904.1 NDRPDR sel
+#        - 55  # 1904.1 NDRPDR sel
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -388,7 +388,7 @@
 #        - 27  # NDRPDR full
 #        - 30  # NDRPDR full
 #        - 31  # NDRPDR full
-        - 37  # 1904.1 NDRPDR sel
+        - 38  # 1904.2 NDRPDR sel
 
 #    vpp-perf-results-2n-skx:
 #      csit-vpp-perf-verify-1904-2n-skx:
@@ -411,15 +411,15 @@
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 162
+        - 185
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
-        - 160
+        - 183
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 160
+        - 183
 
 #    # VPP Ligato
 #    ligato-perf-results-3n-hsw:
@@ -475,57 +475,57 @@
 #      - "intel-dnv-vpp-changes-2n-dnv-ref"
 #      - "intel-dnv-vpp-changes-2n-dnv-cmp"
 
-    vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 8   # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
-        - 42  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
-      csit-vpp-perf-verify-1901-3n-hsw:
-        - 10  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 46  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 61  # NDRPDR LB
-        - 62  # NDRPDR LB
-        - 63  # NDRPDR LB
-        - 64  # NDRPDR LB
-        - 65  # NDRPDR LB
-        - 66  # NDRPDR LB
-        - 67  # NDRPDR LB
-        - 69  # NDRPDR LB
-        - 70  # NDRPDR LB
-        - 71  # NDRPDR LB
-    vpp-performance-changes-3n-hsw-cmp:
-      csit-vpp-perf-verify-1904-3n-hsw:
-#        - 11  # NDRPDR sel
+#    vpp-performance-changes-3n-hsw-h1:
+#      csit-vpp-perf-verify-1810-3n-hsw:
+#        - 8   # NDRPDR sel
 #        - 12  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 21  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 18  # NDRPDR sel
 #        - 23  # NDRPDR sel
-#        - 24  # NDRPDR sel
 #        - 25  # NDRPDR sel
-#        - 26  # NDRPDR sel
-#        - 29  # NDRPDR sel
-#        - 30  # NDRPDR sel
-        - 55  # 1904.1 NDRPDR sel
-    vpp-performance-changes-3n-hsw:
-      - "vpp-performance-changes-3n-hsw-h1"
-      - "vpp-performance-changes-3n-hsw-ref"
-      - "vpp-performance-changes-3n-hsw-cmp"
+#        - 38  # NDRPDR sel
+#        - 39  # NDRPDR sel
+#        - 41  # NDRPDR sel
+#        - 42  # NDRPDR sel
+#    vpp-performance-changes-3n-hsw-ref:
+#      csit-vpp-perf-verify-1901-3n-hsw:
+#        - 10  # NDRPDR sel
+#        - 19  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 36  # NDRPDR sel
+#        - 40  # NDRPDR sel
+#        - 42  # NDRPDR sel
+#        - 44  # NDRPDR sel
+#        - 46  # NDRPDR sel
+#        - 47  # NDRPDR sel
+#        - 48  # NDRPDR sel
+#        - 61  # NDRPDR LB
+#        - 62  # NDRPDR LB
+#        - 63  # NDRPDR LB
+#        - 64  # NDRPDR LB
+#        - 65  # NDRPDR LB
+#        - 66  # NDRPDR LB
+#        - 67  # NDRPDR LB
+#        - 69  # NDRPDR LB
+#        - 70  # NDRPDR LB
+#        - 71  # NDRPDR LB
+#    vpp-performance-changes-3n-hsw-cmp:
+#      csit-vpp-perf-verify-1904-3n-hsw:
+##        - 11  # NDRPDR sel
+##        - 12  # NDRPDR sel
+##        - 20  # NDRPDR sel
+##        - 21  # NDRPDR sel
+##        - 23  # NDRPDR sel
+##        - 24  # NDRPDR sel
+##        - 25  # NDRPDR sel
+##        - 26  # NDRPDR sel
+##        - 29  # NDRPDR sel
+##        - 30  # NDRPDR sel
+#        - 55  # 1904.1 NDRPDR sel
+#    vpp-performance-changes-3n-hsw:
+#      - "vpp-performance-changes-3n-hsw-h1"
+#      - "vpp-performance-changes-3n-hsw-ref"
+#      - "vpp-performance-changes-3n-hsw-cmp"
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -551,16 +551,16 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
-        - 54  # NDRPDR LB
-        - 57  # NDRPDR LB
-        - 58  # NDRPDR LB
-        - 59  # NDRPDR LB
-        - 60  # NDRPDR LB
-        - 63  # NDRPDR LB
-        - 64  # NDRPDR LB
-        - 65  # NDRPDR LB
-        - 66  # NDRPDR LB
-        - 67  # NDRPDR LB
+#        - 54  # NDRPDR LB
+#        - 57  # NDRPDR LB
+#        - 58  # NDRPDR LB
+#        - 59  # NDRPDR LB
+#        - 60  # NDRPDR LB
+#        - 63  # NDRPDR LB
+#        - 64  # NDRPDR LB
+#        - 65  # NDRPDR LB
+#        - 66  # NDRPDR LB
+#        - 67  # NDRPDR LB
     vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
 #        - 8   # NDRPDR sel
@@ -573,7 +573,7 @@
 #        - 21  # NDRPDR sel
 #        - 23  # NDRPDR sel
 #        - 25  # NDRPDR sel
-        - 37  # 1904.1 NDRPDR sel
+        - 38  # 1904.2 NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -1359,8 +1359,8 @@
     extract: "robot-plugin/output.xml"
 
   builds:
-##    intel-dnv-vpp-release-1904:
-##      - 1
+#    intel-dnv-vpp-release-1904:
+#      - 1
 #
 #    intel-dnv-vpp-release-1901:
 #      - 1
@@ -1368,18 +1368,18 @@
 #    intel-dnv-vpp-release-1810:
 #      - 1
 
-    csit-vpp-perf-verify-1810-3n-hsw:
+#    csit-vpp-perf-verify-1810-3n-hsw:
 #      - 9   # MRR sel
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
+#      - 8   # NDRPDR sel
+#      - 12  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 18  # NDRPDR sel
+#      - 23  # NDRPDR sel
+#      - 25  # NDRPDR sel
+#      - 38  # NDRPDR sel
+#      - 39  # NDRPDR sel
+#      - 41  # NDRPDR sel
+#      - 42  # NDRPDR sel
 #      - 28  # WRK
 #      - 29  # WRK
 #      - 30  # WRK
@@ -1390,18 +1390,18 @@
 #      - 35  # WRK
 #      - 36  # WRK
 #      - 37  # WRK
-    csit-vpp-perf-verify-1901-3n-hsw:
+#    csit-vpp-perf-verify-1901-3n-hsw:
 #      - 35  # MRR sel
-      - 10  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 46  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+#      - 10  # NDRPDR sel
+#      - 19  # NDRPDR sel
+#      - 31  # NDRPDR sel
+#      - 36  # NDRPDR sel
+#      - 40  # NDRPDR sel
+#      - 42  # NDRPDR sel
+#      - 44  # NDRPDR sel
+#      - 46  # NDRPDR sel
+#      - 47  # NDRPDR sel
+#      - 48  # NDRPDR sel
 #      - 61  # NDRPDR LB
 #      - 62  # NDRPDR LB
 #      - 63  # NDRPDR LB
@@ -1412,8 +1412,7 @@
 #      - 69  # NDRPDR LB
 #      - 70  # NDRPDR LB
 #      - 71  # NDRPDR LB
-    # TODO: Add 1904 Data
-    csit-vpp-perf-verify-1904-3n-hsw:
+#    csit-vpp-perf-verify-1904-3n-hsw:
 #      - 9   # MRR sel
 #      - 32  # NDRPDR full
 #      - 33  # NDRPDR full
@@ -1439,7 +1438,7 @@
 #      - 26  # NDRPDR sel
 #      - 29  # NDRPDR sel
 #      - 30  # NDRPDR sel
-      - 55  # 1904.1 NDRPDR sel
+#      - 55  # 1904.1 NDRPDR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
 #      - 9   # MRR sel
@@ -1494,7 +1493,7 @@
 #      - 21  # NDRPDR sel
 #      - 23  # NDRPDR sel
 #      - 25  # NDRPDR sel
-      - 37  # 1904.1 NDRPDR sel
+      - 38  # 1904.2 NDRPDR sel
 
 #    csit-vpp-perf-verify-1810-2n-skx:
 #      - 8   # MRR sel
@@ -1579,8 +1578,8 @@
 #      - 16  # NDRPDR sel
 #      - 17  # NDRPDR sel
 #      - 18  # NDRPDR sel
-##    csit-ligato-perf-verify-1904-3n-hsw:
-##      -
+#    csit-ligato-perf-verify-1904-3n-hsw:
+#      -
 
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
@@ -1685,11 +1684,11 @@
       - 12  # NDRPDR sel
 
     csit-vpp-functional-1904-ubuntu1604-virl:
-      - 162
+      - 185
     csit-vpp-functional-1904-centos7-virl:
-      - 160
+      - 183
     csit-vpp-device-1904-ubuntu1804-1n-skx:
-      - 160
+      - 183
 #    # Not used
 #    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
 #      - 1
@@ -1710,686 +1709,8 @@
 ###                               T A B L E S                                ###
 ################################################################################
 
-## VPP Compare NICs 3n-hsw 1t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 1t1c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 3n-hsw 2t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 2t2c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 3n-hsw 1t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 1t1c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 3n-hsw 2t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 2t2c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-
-## VPP Compare NICs 3n-hsw 1t1c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 1t1c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-## VPP Compare NICs 3n-hsw 2t2c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 2t2c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-## VPP Compare NICs 3n-hsw 4t4c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-hsw 4t4c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
-#  reference:
-#    title: "Intel-x520"
-#    nic: "NIC_Intel-X520-DA2"
-#  compare:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  data: "vpp-nic-comparison-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-
-## VPP Compare NICs 3n-skx 2t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 2t1c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 3n-skx 4t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 4t2c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 3n-skx 2t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 2t1c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-# # VPP Compare NICs 3n-skx 4t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 4t2c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-
-## VPP Compare NICs 3n-skx 2t1c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 2t1c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-## VPP Compare NICs 3n-skx 4t2c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 4t2c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-# # VPP Compare NICs 3n-skx 8t4c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 3n-skx 8t4c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-
-## VPP Compare NICs 2n-skx 2t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 2t1c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 2n-skx 4t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 4t2c ndr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-# # VPP Compare NICs 2n-skx 2t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 2t1c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 2n-skx 4t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 4t2c pdr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#  - "tags"
-#
-## VPP Compare NICs 2n-skx 2t1c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 2t1c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-## VPP Compare NICs 2n-skx 4t2c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 4t2c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-#
-## VPP Compare NICs 2n-skx 8t4c mrr
-#-
-#  type: "table"
-#  title: "VPP Compare NICs 2n-skx 8t4c mrr"
-#  algorithm: "table_nics_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
-#  reference:
-#    title: "Intel-x710"
-#    nic: "NIC_Intel-X710"
-#  compare:
-#    title: "Intel-xxv710"
-#    nic: "NIC_Intel-XXV710"
-#  data: "vpp-nic-comparison-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#  - "tags"
-
-################################################################################
 # VPP
 
-## VPP Performance Changes 2n-dnv 1t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 2t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 1t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "NDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 2t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "NDR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 1t1c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'1T1C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-dnv 2t2c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'2T2C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-dnv 4t4c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
-#  reference:
-#    title: "rls1810"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'4T4C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-# VPP Performance Changes 3n-hsw 1t1c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data: "vpp-performance-changes-3n-hsw-h1"
-  reference:
-    title: "rls1810"
-    data: "vpp-performance-changes-3n-hsw-ref"
-  compare:
-    title: "rls1901.1"
-    data: "vpp-performance-changes-3n-hsw-cmp"
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 3n-hsw 2t2c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data: "vpp-performance-changes-3n-hsw-h1"
-  reference:
-    title: "rls1810"
-    data: "vpp-performance-changes-3n-hsw-ref"
-  compare:
-    title: "rls1901.1"
-    data: "vpp-performance-changes-3n-hsw-cmp"
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 3n-hsw 1t1c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data: "vpp-performance-changes-3n-hsw-h1"
-  reference:
-    title: "rls1810"
-    data: "vpp-performance-changes-3n-hsw-ref"
-  compare:
-    title: "rls1901.1"
-    data: "vpp-performance-changes-3n-hsw-cmp"
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 3n-hsw 2t2c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data: "vpp-performance-changes-3n-hsw-h1"
-  reference:
-    title: "rls1810"
-    data: "vpp-performance-changes-3n-hsw-ref"
-  compare:
-    title: "rls1901.1"
-    data: "vpp-performance-changes-3n-hsw-cmp"
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
 # VPP Performance Changes 3n-skx 2t1c pdr
 -
   type: "table"
@@ -2398,13 +1719,13 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904.2"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2422,13 +1743,13 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904.2"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2446,13 +1767,13 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904.2"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2470,13 +1791,13 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904.2"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2486,617 +1807,6 @@
   - "parent"
   - "throughput"
 
-## VPP Performance Changes 2n-skx 2t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 2t1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-cmp"
-#  data: "vpp-performance-changes-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-skx 4t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 4t2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
-#  history:
-#    - title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-cmp"
-#  data: "vpp-performance-changes-2n-skx"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-skx 2t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 2t1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
-#  history:
-#    - title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-cmp"
-#  data: "vpp-performance-changes-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-skx 4t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 4t2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
-#  history:
-#    - title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-cmp"
-#  data: "vpp-performance-changes-2n-skx"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-cmp"
-#  data: "vpp-compare-topologies"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-cmp"
-#  data: "vpp-compare-topologies"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-cmp"
-#  data: "vpp-compare-topologies"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-cmp"
-#  data: "vpp-compare-topologies"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-
-## VPP Performance Changes 3n-hsw 1t1c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
-#  data: "vpp-performance-changes-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 3n-hsw 2t2c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 2t2c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
-#  data: "vpp-performance-changes-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 3n-hsw 4t4c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 4t4c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
-#  data: "vpp-performance-changes-3n-hsw-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-## VPP Performance Changes 3n-skx 2t1c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-skx 2t1c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 3n-skx 4t2c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-skx 4t2c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 3n-skx 8t4c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-skx 8t4c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-3n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-## VPP Performance Changes 2n-skx 2t1c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 2t1c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-skx 4t2c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 4t2c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-skx 8t4c MRR
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 2n-skx 8t4c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-2n-skx-mrr-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-2n-skx-mrr-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-2n-skx-mrr-cmp"
-#  data: "vpp-performance-changes-2n-skx-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-mrr-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-mrr-cmp"
-#  data: "vpp-compare-testbeds-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'MRR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-mrr-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-mrr-cmp"
-#  data: "vpp-compare-testbeds-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'MRR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-mrr-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-mrr-cmp"
-#  data: "vpp-compare-testbeds-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'MRR' and '4C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-mrr-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-mrr-cmp"
-#  data: "vpp-compare-topologies-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'MRR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-mrr-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-mrr-cmp"
-#  data: "vpp-compare-topologies-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'MRR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
-#  reference:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-topologies-mrr-ref"
-#  compare:
-#    title: "2-Node Skx"
-#    data: "vpp-compare-topologies-mrr-cmp"
-#  data: "vpp-compare-topologies-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'MRR' and '4C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
-# Detailed Test Results - VPP Performance Results 3n-hsw
--
-  type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - VPP Performance Results 3n-skx
 -
   type: "table"
@@ -3119,72 +1829,6 @@
   - "parent"
   - "msg"
 
-## Detailed Test Results - VPP Performance Results 2n-skx
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP Performance Results 2n-skx"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-## Detailed Test Results - VPP Performance Results 2n-dnv
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-# Test configuration - VPP Performance Test Configs 3n-hsw
--
-  type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
 # Test configuration - VPP Performance Test Configs 3n-skx
 -
   type: "table"
@@ -3207,72 +1851,6 @@
   - "name"
   - "conf-history"
 
-## Test configuration - VPP Performance Test Configs 2n-skx
-#-
-#  type: "table"
-#  title: "Test configuration - VPP Performance Test Configs 2n-skx"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-## Test configuration - VPP Performance Test Configs 2n-dnv
-#-
-#  type: "table"
-#  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-# Test Operational Data - VPP Performance Operational Data 3n-hsw
--
-  type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "parent"
-  - "name"
-  - "show-run"
-
 # Test Operational Data - VPP Performance Operational Data 3n-skx
 -
   type: "table"
@@ -3295,226 +1873,6 @@
   - "name"
   - "show-run"
 
-## Test Operational Data - VPP Performance Operational Data 2n-skx
-#-
-#  type: "table"
-#  title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-#    data: "data show-run"
-#  rows: "generated"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "show-run"
-
-## Test Operational Data - VPP Performance Operational Data 2n-dnv
-#-
-#  type: "table"
-#  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-#    data: "data show-run"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "show-run"
-
-## Detailed Test Results - VPP MRR Results 3n-hsw
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 3n-hsw"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "vpp-mrr-results-3n-hsw"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-## Detailed Test Results - VPP MRR Results 3n-skx
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 3n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-## Detailed Test Results - VPP MRR Results 2n-skx
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 2n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-## Detailed Test Results - VPP MRR Results 2n-dnv
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
-## Test configuration - VPP MRR Test Configs 3n-hsw
-#-
-#  type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-mrr-results-3n-hsw"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-## Test configuration - VPP MRR Test Configs 3n-skx
-#-
-#  type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 3n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-## Test configuration - VPP MRR Test Configs 2n-skx
-#-
-#  type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 2n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-## Test configuration - VPP MRR Test Configs 2n-dnv
-#-
-#  type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
 # Detailed Test Results - VPP Functional Results - Ubuntu
 -
   type: "table"
@@ -3612,28 +1970,6 @@
   - "name"
   - "conf-history"
 
-## Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
-#-
-#  type: "table"
-#  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "ligato-perf-results-3n-hsw"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
 # Detailed Test Results - VPP Device Results - Ubuntu
 -
   type: "table"
@@ -3692,13 +2028,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3716,13 +2052,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3740,13 +2076,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3764,13 +2100,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3788,13 +2124,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3812,13 +2148,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3836,13 +2172,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3860,13 +2196,13 @@
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
     -
-      title: "rls1807"
+      title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3963,10 +2299,10 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3983,10 +2319,10 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -4003,10 +2339,10 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -4023,10 +2359,10 @@
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -4102,104 +2438,20 @@
   - "parent"
   - "msg"
 
-################################################################################
-## HoneyComb
-#-
-#  type: "table"
-#  title: "Detailed Test Results - Honeycomb Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    "hc-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
-
-################################################################################
-## NSH SFC
-#-
-#  type: "table"
-#  title: "Detailed Test Results - NSH SFC Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    "nsh-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
-
-################################################################################
-## DMM
-#-
-#  type: "table"
-#  title: "Detailed Test Results - DMM Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    "dmm-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
-
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
 
-# VPP Performance Results 3n-hsw
+# VPP Performance Results 3n-skx
 -
   type: "file"
-  title: "VPP Performance Results 3n-hsw"
+  title: "VPP Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
+  data: "vpp-perf-results-3n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
@@ -4208,79 +2460,7 @@
   - "parent"
   data-start-level: 3
 
-# VPP Performance Results 3n-skx
--
-  type: "file"
-  title: "VPP Performance Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
-
-## VPP Performance Results 2n-skx
-#-
-#  type: "file"
-#  title: "VPP Performance Results 2n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP Performance Results 2n-dnv
-#-
-#  type: "file"
-#  title: "VPP Performance Results 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-# VPP Performance Configuration 3n-hsw
--
-  type: "file"
-  title: "VPP Performance Configuration 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
-
-# VPP Performance Configuration 3n-skx
+# VPP Performance Configuration 3n-skx
 -
   type: "file"
   title: "VPP Performance Configuration 3n-skx"
@@ -4298,60 +2478,6 @@
   - "parent"
   data-start-level: 3
 
-## VPP Performance Configuration 2n-skx
-#-
-#  type: "file"
-#  title: "VPP Performance Configuration 2n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP Performance Configuration 2n-dnv
-#-
-#  type: "file"
-#  title: "VPP Performance Configuration 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-# VPP Performance Operational Data 3n-hsw
--
-  type: "file"
-  title: "VPP Performance Operational Data 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
-
 # VPP Performance Operational Data 3n-skx
 -
   type: "file"
@@ -4370,186 +2496,6 @@
   - "parent"
   data-start-level: 3
 
-## VPP Performance Operational Data 2n-skx
-#-
-#  type: "file"
-#  title: "VPP Performance Operational Data 2n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_2n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
-#  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP Performance Operational Data 2n-dnv
-#-
-#  type: "file"
-#  title: "VPP Performance Operational Data 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Results 3n-hsw
-#-
-#  type: "file"
-#  title: "VPP MRR Results 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
-#  data: "vpp-mrr-results-3n-hsw"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Results 3n-skx
-#-
-#  type: "file"
-#  title: "VPP MRR Results 3n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
-#  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Results 2n-skx
-#-
-#  type: "file"
-#  title: "VPP MRR Results 2n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
-#  data: "vpp-mrr-results-2n-skx"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Results 2n-dnv
-#-
-#  type: "file"
-#  title: "VPP MRR Results 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Configuration 3n-hsw
-#-
-#  type: "file"
-#  title: "VPP MRR Configuration 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_configuration_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}"
-#  data: "vpp-mrr-results-3n-hsw"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Configuration 3n-skx
-#-
-#  type: "file"
-#  title: "VPP MRR Configuration 3n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_configuration_3n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}"
-#  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Configuration 2n-skx
-#-
-#  type: "file"
-#  title: "VPP MRR Configuration 2n-skx"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_configuration_2n_skx"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}"
-#  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## VPP MRR Configuration 2n-dnv
-#-
-#  type: "file"
-#  title: "VPP MRR Configuration 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
 # VPP Functional Results - Ubuntu
 -
   type: "file"
@@ -4660,24 +2606,6 @@
   - "parent"
   data-start-level: 2
 
-## Container Orchestrated Performance Results 3n-hsw
-#-
-#  type: "file"
-#  title: "Container Orchestrated Performance Results 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
-#  data: "ligato-perf-results-3n-hsw"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
 # DPDK Performance Results 3n-hsw
 -
   type: "file"
@@ -4732,5247 +2660,829 @@
   - "parent"
   data-start-level: 3
 
-## Honeycomb Functional Results
-#-
-#  type: "file"
-#  title: "Honeycomb Functional Results"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,FUNC,HC]}/honeycomb_functional_results"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,FUNC,HC]}"
-#  data:
-#    "hc-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## NSH SFC Functional Results
-#-
-#  type: "file"
-#  title: "NSH SFC Functional Results"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
-#  data:
-#    "nsh-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
-## DMM Functional Results
-#-
-#  type: "file"
-#  title: "DMM Functional Results"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,FUNC,DMM]}"
-#  data:
-#    "dmm-func-results"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
-
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
 
-## Soak test - 30min Soak Test (PLRsearch), boxes
-#-
-#  type: "plot"
-#  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-#  algorithm: "plot_soak_boxes"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
-#  data: "plot-vpp-soak-2n-skx"
-#  filter: "'SOAK'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-##  - "L2XCBASE"
-##  - "L2BDMACLRN"
-##  - "IP4FWD"
-##  - "IP6FWD"
-#  - "VHOST"
-#  layout:
-#    title: "30min Soak Test (PLRsearch)"
-#    layout: "plot-soak-throughput"
-#
-## Soak test - example, not used
-#-
-#  type: "plot"
-#  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-#  algorithm: "plot_soak_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
-#  data: "plot-vpp-soak-2n-skx"
-#  filter: "'SOAK'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-##  - "L2XCBASE"
-##  - "L2BDMACLRN"
-##  - "IP4FWD"
-##  - "IP6FWD"
-#  - "VHOST"
-#  layout:
-#    title: "30min Soak Test (PLRsearch)"
-#    layout: "plot-soak-throughput"
-
-################################################################################
-# Plots - NF Density - VSC
-
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'VM' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-#    layout: "plot-service-density"
-#
-#################################################################################
-## Plots - NF Density - CSC
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#################################################################################
-## Plots - NF Density - CSP
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#-
-#  type: "plot"
-#  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-#  algorithm: "plot_service_density_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
-#    layout: "plot-service-density"
-
-################################################################################
-## Plots VPP HTTP Server Performance
-#-
-#  type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-#  # each tag is enclosed with ' (apostrophe).
-#  filter: "'HTTP' and 'TCP_CPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-cps"
-#
-#-
-#  type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_RPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-rps"
-
-################################################################################
 
-## Packet Throughput - VPP L2 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP L2 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-hsw-x520 features-oacl
+# Packet Throughput - VPP L2 3n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
+# Packet Throughput - VPP L2 3n-skx-x710 features
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP L2 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP L2 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+
+# Packet Throughput - VPP Container Memif 3n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+
+# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP L2 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
-## Packet Throughput - VPP L2 2n-dnv-x553 base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP Container Memif 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Memif 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Memif 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP IPv4 3n-skx-x710 features
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP Container Memif 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Memif 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
+# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10005,8 +3515,7 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10039,8 +3548,7 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10073,8 +3581,7 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10107,9 +3614,8 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
--
-  type: "plot"
+# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10120,7 +3626,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10141,8 +3647,7 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10153,7 +3658,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10174,8 +3679,7 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10186,7 +3690,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10207,8 +3711,7 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -10219,7 +3722,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10240,3214 +3743,965 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
+  traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-#    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv6 3n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP IPv6 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-## Packet Throughput - VPP IPv6 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv6 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv6 3n-hsw-x710 - features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv6 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP vhost ip4 3n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv6 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv6 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv6 2n-dnv-x553 base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-#
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+# Packet Throughput - VPP IPSec 3n-skx-x710 SW
+- type: "plot"
+  title: "VPP Throughput: ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13458,24 +4712,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    title: "ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13486,24 +4737,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+    title: "ipsec-int-3n-skx-x710-64b-2t1c-sw-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13514,24 +4762,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13542,24 +4787,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+    title: "ipsec-int-3n-skx-x710-64b-4t2c-sw-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+# Packet Throughput - VPP IPSec 3n-skx-x710 SW TUN
+- type: "plot"
+  title: "VPP Throughput: ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13567,26 +4810,24 @@
   - "tags"
   traces:
     hoverinfo: "x+y"
-    boxpoints: "outliers"
+    boxpotnls: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13594,26 +4835,24 @@
   - "tags"
   traces:
     hoverinfo: "x+y"
-    boxpoints: "outliers"
+    boxpotnls: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+    title: "ipsec-tnl-3n-skx-x710-64b-2t1c-sw-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13621,26 +4860,24 @@
   - "tags"
   traces:
     hoverinfo: "x+y"
-    boxpoints: "outliers"
+    boxpotnls: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    title: "ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+- type: "plot"
+  title: "VPP Throughput: ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -13648,29 +4885,25 @@
   - "tags"
   traces:
     hoverinfo: "x+y"
-    boxpoints: "outliers"
+    boxpotnls: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+    title: "ipsec-tnl-3n-skx-x710-64b-4t2c-sw-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+# Packet Throughput - DPDK l3fwd 3n-skx-x710
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  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
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -13680,23 +4913,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -13706,23 +4937,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -13732,23 +4961,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  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
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
@@ -13758,2133 +4985,315 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-#################################################################################
-#
-## Packet Throughput - VPP vhost ip4 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost ip4 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           'ETH' and
-           'IP4FWD' and
            '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           'ETH' and
-           'IP4FWD' and
            '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           'ETH' and
-           'IP4FWD' and
            '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           'ETH' and
-           'IP4FWD' and
            '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - DPDK l3fwd 2n-skx-x710
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            'BASE' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
+- type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost ip4 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost ip4 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
-###############################################################################
-
-# Packet Throughput - VPP VTS 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
+################################################################################
+
+# Packet Throughput - DPDK testpmd 3n-hsw-x520
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VTS'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -15894,21 +5303,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'VTS'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -15918,21 +5327,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'VTS'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -15942,21 +5351,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'VTS'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -15966,25 +5375,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+# Packet Throughput - DPDK testpmd 3n-hsw-x710
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -15994,22 +5400,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16019,22 +5424,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16044,22 +5448,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16069,23 +5472,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+# Packet Throughput - DPDK testpmd 3n-hsw-xl710
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16095,22 +5497,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16120,22 +5521,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16145,22 +5545,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16170,23 +5569,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+# Packet Throughput - DPDK testpmd 3n-skx-x710
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16196,22 +5594,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16221,22 +5618,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+- 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]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16246,22 +5642,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+- 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]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16271,23 +5666,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+# 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]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16297,22 +5691,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+- 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]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16322,22 +5715,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+- 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]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16347,22 +5739,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+- 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]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16372,23 +5763,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+# 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]}/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-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16398,22 +5788,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+- 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]}/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-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16423,22 +5812,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+- 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]}/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-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16448,22 +5836,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+- 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]}/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-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16473,23 +5860,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+# 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]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16499,22 +5885,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+- 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]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16524,22 +5909,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+- 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]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16549,22 +5933,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+- 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]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -16574,7873 +5957,1525 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
+################################################################################
+
+
+# Packet Latency - VPP L2 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
+# Packet Latency - VPP L2 3n-skx-x710 features
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Latency - VPP L2 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2PATCH"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2PATCH"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP L2 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-macip
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP L2 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP L2 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP L2 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP L2 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ETH' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP L2 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP Container Memif 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP Container Memif 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x520 features nat44
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x710 features nat44
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x710 features iacl
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP IPv4 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP IPv6 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv6 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv6 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-#    layout: "plot-latency"
-
-# Packet Latency - VPP IPv6 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-## Packet Latency - VPP IPv6 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv6 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+# Packet Latency - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           '2T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+           '4T2C' and
            'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-#################################################################################
-#
-## Packet Latency - VPP vhost ip4 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost ip4 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-#    layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# Packet Latency - VPP Container Memif 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "1VM"
-  - "2VM"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "1VM"
-  - "2VM"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+
+# Packet Latency - VPP IPv4 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost ip4 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost ip4 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '4T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP VTS 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'VTS'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'VTS'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+# Packet Latency - VPP IPv4 3n-skx-x710 features nat44
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+# Packet Latency - VPP IPv4 3n-skx-x710 features iacl
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           'IP4FWD' and
+           'IACL' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+
+# Packet Latency - VPP IPv6 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+
+# Packet Latency - VPP vhost ip4 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'IP4FWD'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'IP4FWD'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+# Packet Latency - VPP IPSec 3n-skx-x710 SW
+- type: "plot"
+  title: "VPP Latency: ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "ipsec-int-3n-skx-x710-64b-2t1c-sw-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "ipsec-int-3n-skx-x710-64b-4t2c-sw-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+# Packet Latency - VPP IPSec 3n-skx-x710 SW TUN
+- type: "plot"
+  title: "VPP Latency: ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "ipsec-tnl-3n-skx-x710-64b-2t1c-sw-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "ipsec-tnl-3n-skx-x710-64b-4t2c-sw-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+# Packet Latency - DPDK l3fwd 3n-skx-x710
+- type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+# Packet Latency - DPDK l3fwd 3n-skx-xxv710
+- type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+# Packet Latency - DPDK l3fwd 2n-skx-x710
+- type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+# Packet Latency - DPDK l3fwd 2n-skx-xxv710
+- type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/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"
   - "tags"
   layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-latency"
 
 ################################################################################
 
-## Speedup - VPP Container Memif 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x520-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-3n-hsw-xl710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 3n-hsw-x520
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/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' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP Container Memif 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-## Speedup - VPP IPv4 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x520 features nat44
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-nat44-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x520 features iacl
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-iacl-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-# Speedup - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 3n-hsw-x710
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            ('NAT44' and 'BASE') or
-#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "DOT1Q"
-#  - "IP4BASE"
-#  - "NAT44"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACL"
-#  - "OACL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x710 features nat44
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('NAT44' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "BASE"
-#  - "SRC_USER_10"
-#  - "SRC_USER_100"
-#  - "SRC_USER_1000"
-#  - "SRC_USER_2000"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-nat44-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-x710 features iacl
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-xl710-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-3n-hsw-xl710-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 3n-hsw-xl710
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 3n-skx-x710
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) 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"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) 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"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 3n-skx-xxv710
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-nat44-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 2n-skx-x710
+- type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           'NDRPDR' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK testpmd 2n-skx-xxv710
+- type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+- type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP IPv4 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP IPv4 2n-dnv-x553 base
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
 ################################################################################
 
-## Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 Tunnels 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "LISP"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-#           not 'DOT1Q' and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
-#  layout:
-#    title: "ip4tun-3n-hsw-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+# Speedup - VPP Container Memif 3n-skx-x710
+- type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'IPSECHW'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+
+# Speedup - VPP IPv4 3n-skx-x710 base and scale
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-## Speedup - VPP IPv6 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x520-78b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x520-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv6 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  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-hsw-x710-78b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv6 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  layout:
-#    title: "ip6-3n-hsw-x710-78b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv6 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-3n-hsw-xl710-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv6 3n-skx-x710
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+# Speedup - VPP IPv4 3n-skx-x710 features
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24448,27 +7483,32 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24476,31 +7516,29 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-skx-x710 features
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
+# Speedup - VPP IPv4 3n-skx-x710 features nat44
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24508,30 +7546,27 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24539,806 +7574,359 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-features-nat44-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP IPv6 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPv6 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP IPv6 2n-dnv-x553 base
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-## Speedup - VPP IPv6 tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#################################################################################
-
-# Speedup - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
+# Speedup - VPP IPv4 3n-skx-x710 features iacl
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           'IPSECHW' and
+           'IP4FWD' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
+    title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'BASE' and
-           'IPSECHW' and
+           'IP4FWD' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
+    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
+# Speedup - VPP IPv4 3n-skx-x710 features oacl
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
+           'IP4FWD' and
+           'OACL' and
+           ('ACL10' or 'ACL50') and '10K_FLOWS' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
+    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
+           'IP4FWD' and
+           'OACL' and
+           ('ACL10' or 'ACL50') and '10K_FLOWS' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
+    title: "ip4-3n-skx-x710-64b-features-oacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
+
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710
+- type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'ENCAP' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'ENCAP' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
+- type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-ndr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-pdr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-#################################################################################
-#
-## Speedup - VPP L2 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2PATCH"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2PATCH"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP L2 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x520-64b-features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP L2 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF' and
-#           not 'DRV_AVF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF' and
-#           not 'DRV_AVF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP L2 3n-hsw-x710 features
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
-#           not 'VHOST' and
-#           not 'L2OVRLAY' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP L2 3n-hsw-xl710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'BASE' and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  layout:
-#    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP L2 3n-hsw-x520 features-oacl
+
+# Speedup - VPP IPv6 3n-skx-x710
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-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]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-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]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x520 features-macip
+# Speedup - VPP IPv6 3n-skx-x710 features
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+
 # Speedup - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -25368,8 +7956,7 @@
     title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -25400,8 +7987,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -25429,8 +8015,7 @@
     title: "l2sw-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -25458,613 +8043,60 @@
     title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
+# Speedup - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X710' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X710' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP L2 2n-skx-x710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP L2 2n-skx-xxv710 base and scale
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "BASE"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  layout:
-#    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP L2 2n-dnv-x553 base
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "L2PATCH"
-#  layout:
-#    title: "l2sw-2n-dnv-x553-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-## Packet Speedup - VPP vhost ip4 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost ip4 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr"
-#    layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -26089,8 +8121,7 @@
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -26115,405 +8146,84 @@
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost ip4 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost ip4 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'CFS_OPT' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-###############################################################################
-
-# Speedup - VPP vts 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
+# Packet Speedup - VPP IPSec 3n-skx-x710 SW
+- type: "plot"
+  title: "VPP Speedup: ipsec-int-3n-skx-x710-64b-sw-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-sw-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           'VTS'"
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
+    title: "ipsec-int-3n-skx-x710-64b-sw-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "VPP Speedup: ipsec-int-3n-skx-x710-64b-sw-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-int-3n-skx-x710-64b-sw-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'IPSECSW' and 'IPSECINT' and 'AES_GCM' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-int-3n-skx-x710-64b-sw-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Packet Speedup - VPP IPSec 3n-skx-x710 SW TUN
+- type: "plot"
+  title: "VPP Speedup: ipsec-tnl-3n-skx-x710-64b-sw-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-sw-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-tnl-3n-skx-x710-64b-sw-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "VPP Speedup: ipsec-tnl-3n-skx-x710-64b-sw-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-tnl-3n-skx-x710-64b-sw-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           'VTS'"
+           'IPSECSW' and 'IPSECTUN' and 'AES_GCM' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+    title: "ipsec-tnl-3n-skx-x710-64b-sw-pdr"
     layout: "plot-throughput-speedup-analysis"
-- 
2.16.6